diff --git a/ChangeLog b/ChangeLog
index 3bdf7006f..811a3a2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-09 [colin]	2.8.1cvs92
+
+	* src/common/defs.h
+		Use leafpad by default on Maemo. Patch
+		by Jean-Luc Biord.
+
 2007-04-06 [colin]	2.8.1cvs91
 
 	* src/pixmaps/queue_close.xpm
diff --git a/PATCHSETS b/PATCHSETS
index 6aad94967..372f4e4d3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2508,3 +2508,4 @@
 ( cvs diff -u -r 1.155.2.59 -r 1.155.2.60 src/Makefile.am;  cvs diff -u -r 1.25.2.35 -r 1.25.2.36 src/stock_pixmap.c;  diff -u /dev/null src/pixmaps/dir_close_hrm.xpm;  diff -u /dev/null src/pixmaps/dir_close_hrm_mark.xpm;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/drafts_close.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/drafts_close_mark.xpm;  cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/pixmaps/drafts_open.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/drafts_open_mark.xpm;  cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/inbox.xpm;  diff -u /dev/null src/pixmaps/inbox_close.xpm;  diff -u /dev/null src/pixmaps/inbox_close_hrm.xpm;  diff -u /dev/null src/pixmaps/inbox_close_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_close_mark.xpm;  cvs diff -u -r -1.1 -r -1.2 src/pixmaps/inbox_hrm.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inbox_hrm_mark.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inbox_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_open.xpm;  diff -u /dev/null src/pixmaps/inbox_open_hrm.xpm;  diff -u /dev/null src/pixmaps/inbox_open_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/inbox_open_mark.xpm;  cvs diff -u -r -1.1.1.1 -r -1.1.1.2 src/pixmaps/outbox.xpm;  diff -u /dev/null src/pixmaps/outbox_close.xpm;  diff -u /dev/null src/pixmaps/outbox_close_hrm.xpm;  diff -u /dev/null src/pixmaps/outbox_close_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_close_mark.xpm;  cvs diff -u -r -1.1 -r -1.2 src/pixmaps/outbox_hrm.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/outbox_hrm_mark.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/outbox_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_open.xpm;  diff -u /dev/null src/pixmaps/outbox_open_hrm.xpm;  diff -u /dev/null src/pixmaps/outbox_open_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/outbox_open_mark.xpm;  diff -u /dev/null src/pixmaps/queue_close.xpm;  diff -u /dev/null src/pixmaps/queue_close_hrm.xpm;  diff -u /dev/null src/pixmaps/queue_close_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/queue_close_mark.xpm;  diff -u /dev/null src/pixmaps/queue_open.xpm;  diff -u /dev/null src/pixmaps/queue_open_hrm.xpm;  diff -u /dev/null src/pixmaps/queue_open_hrm_mark.xpm;  diff -u /dev/null src/pixmaps/queue_open_mark.xpm;  ) > 2.8.1cvs89.patchset
 ( cvs diff -u -r 1.274.2.183 -r 1.274.2.184 src/mainwindow.c;  ) > 2.8.1cvs90.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_hrm.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_hrm_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_close_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_hrm.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_hrm_mark.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/queue_open_mark.xpm;  ) > 2.8.1cvs91.patchset
+( cvs diff -u -r 1.9.2.35 -r 1.9.2.36 src/common/defs.h;  ) > 2.8.1cvs92.patchset
diff --git a/configure.ac b/configure.ac
index 092bbaf52..040a55ab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=91
+EXTRA_VERSION=92
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/common/defs.h b/src/common/defs.h
index 67071429d..63e04892d 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -118,7 +118,7 @@
 #ifndef MAEMO
 #define DEFAULT_EDITOR_CMD	"gedit '%s'"
 #else
-#define DEFAULT_EDITOR_CMD	"maemopad '%s'"
+#define DEFAULT_EDITOR_CMD	"leafpad '%s'"
 #endif
 #define DEFAULT_MIME_CMD	"metamail -d -b -x -c %s '%s'"
 #define DEFAULT_IMAGE_VIEWER_CMD "display '%s'"