--- apps/app_echo.c	(svn)
+++ apps/app_echo.c	(working copy)
@@ -72,26 +72,35 @@
 			break;
 		f->delivery.tv_sec = 0;
 		f->delivery.tv_usec = 0;
-		if (f->frametype == AST_FRAME_VOICE) {
-			if (ast_write(chan, f)) 
+		switch (f->frametype) {
+			case AST_FRAME_VOICE:
+			case AST_FRAME_VIDEO:
+			case AST_FRAME_TEXT:
+			case AST_FRAME_HTML:
+			case AST_FRAME_IMAGE:
+			case AST_FRAME_DTMF_BEGIN:
+				if (ast_write(chan, f)) {
+					ast_frfree(f);
+					goto end;
+				}
 				break;
-		} else if (f->frametype == AST_FRAME_VIDEO) {
-			if (ast_write(chan, f)) 
-				break;
-		} else if (f->frametype == AST_FRAME_DTMF) {
-			if (f->subclass == '#') {
-				res = 0;
-				break;
-			} else {
-				if (ast_write(chan, f))
-					break;
-			}
+			case AST_FRAME_DTMF_END:
+			case AST_FRAME_DTMF:
+				if (f->subclass == '#') {
+					res = 0;
+					ast_frfree(f);
+					goto end;
+				} else {
+					if (ast_write(chan, f)) {
+						ast_frfree(f);
+						goto end;
+					}
+				}
 		}
 		ast_frfree(f);
 	}
-
+end:
 	LOCAL_USER_REMOVE(u);
-
 	return res;
 }