Index: apps/plugins/text_editor.c
===================================================================
--- apps/plugins/text_editor.c	(Revision 14922)
+++ apps/plugins/text_editor.c	(Arbeitskopie)
@@ -221,7 +221,7 @@
     MENUITEM_STRINGLIST(menu, "Line Options", NULL, 
                         "Cut/Delete", "Copy",
                         "Insert Above", "Insert Below",
-                        "Concat To Above", "Save");
+                        "Concat To Above", "Save Changes...");
 
     switch (rb->do_menu(&menu, NULL))
     {
@@ -438,13 +438,11 @@
                 }
             }
             break;
-            case ACTION_STD_CONTEXT:
-                if (!line_count) break;
-                rb->strcpy(copy_buffer,&buffer[do_action(ACTION_GET,0,cur_sel)]);
-                do_action(ACTION_REMOVE,0,cur_sel);
-                changed = true;
-            break;
-            case ACTION_STD_MENU:
+#ifdef CONFIG_KEYPAD == SANSA_E200_PAD
+            case ACTION_STD_CANCEL:
+#else
+            case ACTION_STD_MENU:
+#endif
             { /* do the item menu */
                 switch (do_item_menu(cur_sel, copy_buffer))
                 {
@@ -460,7 +454,11 @@
                 }
             }
             break;
-            case ACTION_STD_CANCEL:
+#ifdef CONFIG_KEYPAD == SANSA_E200_PAD
+            case ACTION_STD_MENU:
+#else
+            case ACTION_STD_CANCEL:
+#endif
                 if (changed)
                 {
                     MENUITEM_STRINGLIST(menu, "Do What?", NULL, 
Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c	(Revision 14922)
+++ apps/keymaps/keymap-e200.c	(Arbeitskopie)
@@ -239,20 +239,20 @@
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                     BUTTON_NONE },
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
     
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_REC|BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_SCROLL_UP,                 BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_SCROLL_DOWN,               BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     
-    { ACTION_KBD_UP,           BUTTON_SCROLL_UP,                 BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_UP|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_DOWN,               BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP,                 BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN,               BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_KBD_PAGE_FLIP,    BUTTON_REC|BUTTON_SELECT,         BUTTON_REC },
-    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
-    { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REC,                       BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_REC|BUTTON_REPEAT,         BUTTON_NONE },
-    { ACTION_KBD_SELECT,       BUTTON_SELECT,                    BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_SELECT|BUTTON_REL,         BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_UP,                        BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_SELECT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_KBD_ABORT,        BUTTON_POWER,                     BUTTON_NONE },
 
     LAST_ITEM_IN_LIST