diff --git a/gtkedit/ChangeLog b/gtkedit/ChangeLog
index c018b1765..cc9e721c4 100644
--- a/gtkedit/ChangeLog
+++ b/gtkedit/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-18  Pavel Roskin  <proski@gnu.org>
+
+	* edit.h [GTK]: Fix definition of edit_message_dialog().
+	* gtkedit.c (gtk_edit_dialog_message): Use "OK" button, not
+	"Cancel", for consistency with the text edition.
+
 2001-08-17  Pavel Roskin  <proski@gnu.org>
 
 	* syntax.c (syntax_text): Add support for PO files.
diff --git a/gtkedit/edit.h b/gtkedit/edit.h
index c0ff5ce7b..25084f1fa 100644
--- a/gtkedit/edit.h
+++ b/gtkedit/edit.h
@@ -630,7 +630,7 @@ extern Window               gdk_root_window;
 #        define edit_get_load_file(d,f,h) gtk_edit_dialog_get_load_file(d,f,h)
 #        define edit_get_save_file(d,f,h) gtk_edit_dialog_get_save_file(d,f,h)
 #        define edit_error_dialog(h,t) gtk_edit_dialog_error(h,"%s",t)
-#        define edit_message_dialog(h,t) gtk_edit_dialog_message(0,h,"%s",t)
+#        define edit_message_dialog(h,t) gtk_edit_dialog_message(h,"%s",t)
 #        define edit_query_dialog2(h,t,a,b) gtk_edit_dialog_query(h,t,a,b,0)
 #        define edit_query_dialog3(h,t,a,b,c) gtk_edit_dialog_query(h,t,a,b,c,0)
 #        define edit_query_dialog4(h,t,a,b,c,d) gtk_edit_dialog_query(h,t,a,b,c,d,0)
diff --git a/gtkedit/gtkedit.c b/gtkedit/gtkedit.c
index 5cca77903..24ae135d6 100644
--- a/gtkedit/gtkedit.c
+++ b/gtkedit/gtkedit.c
@@ -997,7 +997,7 @@ void gtk_edit_dialog_message (guchar * heading, char *fmt,...)
 			    heading, GTK_CAULDRON_TOPLEVEL | GTK_CAULDRON_GRAB,
 			    " [ ( %Ld )xf ]xf / ( %Bxfgq )f ",
 			    s,
-			    GNOME_STOCK_BUTTON_CANCEL
+			    GNOME_STOCK_BUTTON_OK
 	);
     return;
 }