diff --git a/gtkedit/ChangeLog b/gtkedit/ChangeLog
index 0b72dde4f..3fc0c7441 100644
--- a/gtkedit/ChangeLog
+++ b/gtkedit/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-08  Andrew V. Samoilov  <sav@bcs.zp.ua>
+
+	* editcmd.c [HAVE_CHARSET]: Really include charset.h.
+	* editmenu.c (edit_wrap_cmd): Memory leaking fixed.
+
 2001-06-05  Pavel Roskin  <proski@gnu.org>
 
 	* edit.c [HAVE_CHARSET]: Include charsets.h and selcodepage.h.
diff --git a/gtkedit/editcmd.c b/gtkedit/editcmd.c
index 426c18ac1..83dba891a 100644
--- a/gtkedit/editcmd.c
+++ b/gtkedit/editcmd.c
@@ -41,7 +41,7 @@
 #endif
 #endif
 
-#ifndef HAVE_CHARSET
+#ifdef HAVE_CHARSET
 #include "../src/charsets.h"
 #endif
 
diff --git a/gtkedit/editmenu.c b/gtkedit/editmenu.c
index 4bc96f808..5038fd9dd 100644
--- a/gtkedit/editmenu.c
+++ b/gtkedit/editmenu.c
@@ -4,6 +4,8 @@
 
    Authors: 1996, 1997 Paul Sheer
 
+   $Id$
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
@@ -60,13 +62,12 @@ void edit_wrap_cmd ()
     char s[12];
     sprintf (s, "%d", option_word_wrap_line_length);
     f = input_dialog (_(" Word wrap "), 
-/* Not essential to translate */
-    _(" Enter line length, 0 for off: "), s);
+	_(" Enter line length, 0 for off: "), s);
     if (f) {
 	if (*f) {
 	    option_word_wrap_line_length = atoi (f);
-	    free (f);
 	}
+	free (f);
     }
 }