diff --git a/src/mail_menu.c b/src/mail_menu.c
index d683c67..d6f811d 100644
--- a/src/mail_menu.c
+++ b/src/mail_menu.c
@@ -954,6 +954,9 @@ void unmangle_ansi(char *body, int len, char **body_out, int *body_len) {
 			if (body[i] == '[') {
 				state = 2;
 				continue;
+			} else {
+				state = 0;
+				continue;
 			}
 		} else if (state == 2) {
 			param_count = 0;
diff --git a/utils/magiedit/main.c b/utils/magiedit/main.c
index 1476315..3df71a4 100644
--- a/utils/magiedit/main.c
+++ b/utils/magiedit/main.c
@@ -738,7 +738,7 @@ char *message_editor() {
                         }
 
                         return return_body;     
-                    } else if (ch.chKeyPress != '\n') {
+                    } else if (ch.chKeyPress != '\n' && ch.chKeyPress != 0x1b) {
                         if (position_x >= strlen(line)) {
                             strncat(line, &ch.chKeyPress, 1);
                         } else {