diff --git a/utils/magiedit/main.c b/utils/magiedit/main.c
index 388da90..5be1aa8 100644
--- a/utils/magiedit/main.c
+++ b/utils/magiedit/main.c
@@ -539,7 +539,7 @@ char *message_editor() {
                                     top_of_screen++;
                                 }
                                 position_x = 0;
-
+                                od_clr_line();
                             } else {
                                 if (body_line_count == 0) {
                                     body_lines = (char **)malloc(sizeof(char *));
@@ -620,10 +620,14 @@ char *message_editor() {
                         position_x++;
                     }
 
-                    od_set_cursor(position_y - top_of_screen + 3, position_x);
-                    od_printf("%s", &line[position_x-1]);
-                    od_clr_line();
-                    od_set_cursor(position_y - top_of_screen + 3, position_x + 1);
+                    if (position_x > 0) {
+                        od_set_cursor(position_y - top_of_screen + 3, position_x);
+                        od_printf("%s", &line[position_x-1]);
+                        od_clr_line();
+                        od_set_cursor(position_y - top_of_screen + 3, position_x + 1);
+                    } else {
+                        od_clr_line();
+                    }
 /*
                     if (position_x > 1) {
                         if (position_y > 20) {