diff --git a/ChangeLog b/ChangeLog
index efb6c694e..aeb1372ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2002-12-20
+
+	* src/textview.c: textview_make_clickable_parts(): fixed incorrect
+	  parsing of email addresses.
+
+2002-12-19
+
+	* src/defs.h: added DEFAULT_BROWSER_CMD.
+	* src/mimeview.c: mimeview_view_file()
+	  src/prefs_common.c: prefs_other_create()
+	  src/utils.c: open_uri(): changed the default web browser to
+	  mozilla, and changed 'raise' command (which is undocumented)
+	  to 'new-window' in 'netscape -remote'.
+
+2002-12-19
+
+	* src/compose.c: compose_send_control_enter(): fixed crash on
+	  Ctrl-Enter when Message/Send has no accelerator key (thanks to
+	  Sergey Vlasov).
+
 2002-12-18
 
 	* src/mainwindow.c:
diff --git a/ChangeLog.claws b/ChangeLog.claws
index e85688974..2eb5e619d 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-12-20 [paul]	0.8.6claws118
+
+	* sync with 0.8.6cvs26
+		see ChangeLog 2002-12-19 and 2002-12-20
+
 2002-12-19 [alfons]	0.8.6claws117
 
 	* src/textview.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 7d6095c76..6be15c18d 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,23 @@
+2002-12-20
+
+	* src/textview.c: textview_make_clickable_parts(): 誤った email
+	  アドレスのパースを修正。
+
+2002-12-19
+
+	* src/defs.h: DEFAULT_BROWSER_CMD を追加。
+	* src/mimeview.c: mimeview_view_file()
+	  src/prefs_common.c: prefs_other_create()
+	  src/utils.c: open_uri(): デフォルトの web ブラウザを mozilla に
+	  変更し、 'netscape -remote' 中の 'remote' コマンド(非公開)を
+	  'new-window' に変更。
+
+2002-12-19
+
+	* src/compose.c: compose_send_control_enter(): メッセージ/送信
+	  がアクセラレータキーを持っていない場合に Ctrl-Enter を押すと
+	  クラッシュする問題を修正(Sergey Vlasov さん thanks)。
+
 2002-12-18
 
 	* src/mainwindow.c:
diff --git a/NEWS b/NEWS
index cf6de8d5f..8af7dcfc4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,19 @@
 Changes of Sylpheed
 
+* 0.8.7
+
+    * The extended regular expression has been supported on filtering.
+    * The option to resize images to fit the size of view has been added.
+    * The previous account is now restored on reediting draft messages.
+    * The routine of MIME header encoding has been rewritten completely,
+      and Q-encoding for single-byte locales has been also implemented.
+    * Strings beginning with "www." are now treated as URI.
+    * The common preferences dialog has been reorganized a bit.
+    * Code cleanups for the implementation of SMTP has been made.
+    * Autotools and libtool have been updated.
+    * A fix for font loading problem has been made.
+    * Other minor bugfixes have been made.
+
 * 0.8.6
 
     * Per-folder account setting has been implemented.
diff --git a/configure.in b/configure.in
index b9de378e1..6efbc0aa4 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws117
+EXTRA_VERSION=claws118
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/common/defs.h b/src/common/defs.h
index 7f3337193..db6d51497 100644
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -74,6 +74,7 @@
 /* #define DEFAULT_INC_PATH	"/usr/bin/imget" */
 /* #define DEFAULT_INC_PROGRAM	"imget" */
 #define DEFAULT_SENDMAIL_CMD	"/usr/sbin/sendmail -t"
+#define DEFAULT_BROWSER_CMD	"mozilla -remote 'openURL(%s, new-window)'"
 
 #ifdef _PATH_MAILDIR
 #  define DEFAULT_SPOOL_PATH	_PATH_MAILDIR
diff --git a/src/common/utils.c b/src/common/utils.c
index d655e7e03..8db501838 100644
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -2751,7 +2751,6 @@ void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
 
 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
-	static gchar *default_cmdline = "netscape -remote openURL(%s,raise)";
 	gchar buf[BUFFSIZE];
 	gchar *p;
 	gchar encoded_uri[BUFFSIZE];
@@ -2769,7 +2768,7 @@ gint open_uri(const gchar *uri, const gchar *cmdline)
 		if (cmdline)
 			g_warning("Open URI command line is invalid: `%s'",
 				  cmdline);
-		g_snprintf(buf, sizeof(buf), default_cmdline, encoded_uri);
+		g_snprintf(buf, sizeof(buf), DEFAULT_BROWSER_CMD, encoded_uri);
 	}
 	
 	execute_command_line(buf, TRUE);
diff --git a/src/compose.c b/src/compose.c
index ea714094d..a9e5d857f 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -7081,8 +7081,11 @@ static gboolean compose_send_control_enter(Compose *compose)
 	ifactory = gtk_item_factory_from_widget(compose->menubar);
 	send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
 	list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
+	if (!list)
+		return FALSE;
+
 	accel = (GtkAccelEntry *)list->data;
-	if (accel->accelerator_key == kev->keyval &&
+	if (accel && accel->accelerator_key == kev->keyval &&
 	    (accel->accelerator_mods & ~ignored_mods) ==
 	    (kev->state & ~ignored_mods)) {
 		compose_send_cb(compose, 0, NULL);
diff --git a/src/mimeview.c b/src/mimeview.c
index bb5da71d6..03d31a68f 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -976,8 +976,7 @@ static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
 {
 	static gchar *default_image_cmdline = "display '%s'";
 	static gchar *default_audio_cmdline = "play '%s'";
-	static gchar *default_html_cmdline =
-		"netscape -remote 'openURL(%s,raise)'";
+	static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
 	static gchar *mime_cmdline = "metamail -d -b -x -c %s '%s'";
 	gchar buf[1024];
 	gchar m_buf[1024];
diff --git a/src/prefs_common.c b/src/prefs_common.c
index d51161bda..a31673b85 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -779,7 +779,7 @@ static PrefParam param[] = {
 	 &interface.entry_pixmap_theme,	prefs_set_data_from_entry, prefs_set_entry},
 	
 	/* Other */
-	{"uri_open_command", "netscape -remote 'openURL(%s,raise)'",
+	{"uri_open_command", DEFAULT_BROWSER_CMD,
 	 &prefs_common.uri_cmd, P_STRING,
 	 &other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
 	{"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
@@ -2890,11 +2890,13 @@ static void prefs_other_create(void)
 	gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
 			  GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtkut_combo_set_items (GTK_COMBO (uri_combo),
+			       DEFAULT_BROWSER_CMD,
+			       "galeon --new-tab '%s'",
 			       "galeon '%s'",
 			       "mozilla -remote 'openurl(%s,new-window)'",
-			       "netscape -remote 'openURL(%s,raise)'",
+			       "netscape -remote 'openURL(%s, new-window)'",
 			       "netscape '%s'",
-			       "gnome-moz-remote --raise --newwin '%s'",
+			       "gnome-moz-remote --newwin '%s'",
 			       "kfmclient openURL '%s'",
 			       "opera -newwindow '%s'",
 			       "kterm -e w3m '%s'",