diff --git a/gtkedit/ChangeLog b/gtkedit/ChangeLog
index 2fcb7f236..57b719f6f 100644
--- a/gtkedit/ChangeLog
+++ b/gtkedit/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-13  Pavel Roskin  <proski@gnu.org>
+
+	* editcmd.c (menu_save_mode_cmd): Give meaningful names to the
+	input fields instead of "i" so that they have separate history.
+	* editoptions.c (edit_options_dialog): Likewise.
+
 2001-07-11  Pavel Roskin  <proski@gnu.org>
 
 	* editdraw.c (status_string): Use g_snprintf() instead of
diff --git a/gtkedit/editcmd.c b/gtkedit/editcmd.c
index 2cb94f701..c6d3131c3 100644
--- a/gtkedit/editcmd.c
+++ b/gtkedit/editcmd.c
@@ -396,7 +396,7 @@ void menu_save_mode_cmd (void)
 	{quick_button, 6, DLG_X, 7, DLG_Y, N_("&Ok"), 0,
 	 B_ENTER, 0, 0, "o"},
 	{quick_input, 23, DLG_X, 5, DLG_Y, 0, 9,
-	 0, 0, &str_result, "i"},
+	 0, 0, &str_result, "edit-backup-ext"},
 	{quick_label, 22, DLG_X, 4, DLG_Y, N_("Extension:"), 0,
 	 0, 0, 0, "savemext"},
 	{quick_radio, 4, DLG_X, 3, DLG_Y, "", 3,
diff --git a/gtkedit/editoptions.c b/gtkedit/editoptions.c
index 6fbe01208..9f1422d8f 100644
--- a/gtkedit/editoptions.c
+++ b/gtkedit/editoptions.c
@@ -73,13 +73,13 @@ void edit_options_dialog (void)
 	 0, 0, NULL},
 /*3 */
 	{quick_input, OPT_DLG_W / 2 + 24, OPT_DLG_W, OPT_DLG_H - 4, OPT_DLG_H, "", OPT_DLG_W / 2 - 4 - 24, 0,
-	 0, 0, "i"},
+	 0, 0, "edit-word-wrap"},
 /*4 */
 	{quick_label, OPT_DLG_W / 2, OPT_DLG_W, OPT_DLG_H - 5, OPT_DLG_H, N_("Tab spacing : "), 0, 0,
 	 0, 0, NULL},
 /*5 */
 	{quick_input, OPT_DLG_W / 2 + 24, OPT_DLG_W, OPT_DLG_H - 5, OPT_DLG_H, "", OPT_DLG_W / 2 - 4 - 24, 0,
-	 0, 0, "i"},
+	 0, 0, "edit-tab-spacing"},
 /*6 */
 #if !defined(MIDNIGHT) || defined(HAVE_SYNTAXH)
 #define OA 1