diff --git a/ChangeLog b/ChangeLog
index 06e9df659..8055d0775 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10 [colin]	3.7.9cvs6
+
+	* src/messageview.c
+		Fix it better.
+
 2011-04-10 [colin]	3.7.9cvs5
 
 	* src/messageview.c
diff --git a/PATCHSETS b/PATCHSETS
index 8970f8021..0a7af8f0a 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4157,3 +4157,4 @@
 ( cvs diff -u -r 1.27.2.50 -r 1.27.2.51 src/addr_compl.c;  cvs diff -u -r 1.60.2.140 -r 1.60.2.141 src/addressbook.c;  cvs diff -u -r 1.2.4.25 -r 1.2.4.26 src/browseldap.c;  cvs diff -u -r 1.382.2.570 -r 1.382.2.571 src/compose.c;  cvs diff -u -r 1.213.2.201 -r 1.213.2.202 src/folder.c;  cvs diff -u -r 1.207.2.219 -r 1.207.2.220 src/folderview.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/gtk/gtkvscrollbutton.h;  ) > 3.7.9cvs3.patchset
 ( cvs diff -u -r 1.382.2.571 -r 1.382.2.572 src/compose.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/editaddress_other_attributes_ldap.c;  cvs diff -u -r 1.3.12.35 -r 1.3.12.36 src/message_search.c;  cvs diff -u -r 1.16.2.39 -r 1.16.2.40 src/prefs_display_header.c;  cvs diff -u -r 1.1.4.65 -r 1.1.4.66 src/prefs_filtering_action.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/prefs_other.c;  cvs diff -u -r 1.30.2.63 -r 1.30.2.64 src/prefs_toolbar.c;  cvs diff -u -r 1.15.2.61 -r 1.15.2.62 src/summary_search.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/combobox.c;  cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/gtkutils.h;  ) > 3.7.9cvs4.patchset
 ( cvs diff -u -r 1.94.2.214 -r 1.94.2.215 src/messageview.c;  ) > 3.7.9cvs5.patchset
+( cvs diff -u -r 1.94.2.215 -r 1.94.2.216 src/messageview.c;  ) > 3.7.9cvs6.patchset
diff --git a/configure.ac b/configure.ac
index 20a939448..d95245534 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=5
+EXTRA_VERSION=6
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
index a00dfa73d..6ad5ec242 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2558,7 +2558,7 @@ static void compose_cb(GtkAction *action, gpointer data)
 	if (item) {
 		ac = account_find_from_item(item);
 		if (ac && ac->protocol == A_NNTP &&
-		    item->type == F_NEWS) {
+		    FOLDER_TYPE(item->folder) == F_NEWS) {
 			compose_new(ac, item->path, NULL);
 			return;
 		}