commit - 8e9c5482d2d1b2ce5625746f13bf1a836340fbca
commit + 1a719c663fd2c7ac5cf5e605e16d7c9ed576bca7
blob - fae16170dd5394cc2b76a443145c6991f23ec363
blob + 8d32eb7d55ff91315888d5abc9a3e0fc46ea47e1
--- src/headerview.c
+++ src/headerview.c
@@ -124,7 +124,10 @@ HeaderView *headerview_create(void)
 void headerview_init(HeaderView *headerview)
 {
 	headerview_clear(headerview);
-	headerview_set_visibility(headerview, prefs_common.display_header_pane);
+	if (prefs_common.display_header_pane)
+		gtk_widget_show(headerview->hbox);
+	else
+		gtk_widget_hide(headerview->hbox);
 }
 
 void headerview_show(HeaderView *headerview, MsgInfo *msginfo)
@@ -286,16 +289,3 @@ void headerview_clear(HeaderView *headerview)
 		gtk_widget_queue_resize(headerview->hbox);
 	}
 }
-
-void headerview_set_visibility(HeaderView *headerview, gboolean visibility)
-{
-	if (visibility)
-		gtk_widget_show(headerview->hbox);
-	else
-		gtk_widget_hide(headerview->hbox);
-}
-
-void headerview_destroy(HeaderView *headerview)
-{
-	g_free(headerview);
-}
blob - a4f1015b477a61102b1264ebac9db199833c593f
blob + 35a2ba3c83857ad8a371c10d77804cdaf86a1aad
--- src/headerview.h
+++ src/headerview.h
@@ -45,8 +45,6 @@ void headerview_init		(HeaderView	*headerview);
 void headerview_show		(HeaderView	*headerview,
 				 MsgInfo	*msginfo);
 void headerview_clear		(HeaderView	*headerview);
-void headerview_set_visibility	(HeaderView	*headerview,
-				 gboolean	 visibility);
 void headerview_destroy		(HeaderView	*headerview);
 void headerview_set_font	(HeaderView 	*headerview);
 #endif /* __HEADERVIEW_H__ */
blob - 4892f4f7faa8a56bddefccd44ec66b368f45990a
blob + 288e23fcf29237c1a15953a2e408bb3b62a8ff45
--- src/mainwindow.c
+++ src/mainwindow.c
@@ -1721,8 +1721,11 @@ static gboolean reflect_prefs_timeout_cb(gpointer data
 			hooks_invoke(THEME_CHANGED_HOOKLIST, NULL);
 		}
 
-		headerview_set_visibility(mainwin->messageview->headerview,
-					  prefs_common.display_header_pane);
+
+		if (prefs_common.display_header_pane)
+			gtk_widget_show(mainwin->messageview->headerview->hbox);
+		else
+			gtk_widget_hide(mainwin->messageview->headerview->hbox);
 		textview_reflect_prefs(mainwin->messageview->mimeview->textview);
 		folderview_reflect_prefs();
 		summary_reflect_prefs();
@@ -3077,11 +3080,10 @@ static void main_window_set_widgets(MainWindow *mainwi
 				    prefs_common.mainwin_width,
 				    prefs_common.mainwin_height);
 	}
-	/* remove headerview if not in prefs */
-	headerview_set_visibility(mainwin->messageview->headerview,
-				  prefs_common.display_header_pane);
+	if (!prefs_common.display_header_name)
+		gtk_widget_hide(mainwin->messageview->headerview->hbox);
 
-	if (messageview_is_visible(mainwin->messageview))
+	if (mainwin->messageview->visible)
 		gtk_image_set_from_icon_name(GTK_IMAGE(mainwin->summaryview->toggle_arrow),
 					      "pan-down-symbolic", GTK_ICON_SIZE_MENU);
 	else
blob - fb6d4ca6cde537485d10f0fea43662616d7e46cb
blob + 5a73d31b8247474c6ab200877bc8e63bbab051a9
--- src/mh.c
+++ src/mh.c
@@ -1189,7 +1189,7 @@ static void mh_scan_tree_recursive(FolderItem *item)
 			}
 
 			mh_scan_tree_recursive(new_item);
-		} else if (to_number(dir_name) > 0) n_msg++;
+		}
 
 		g_free(entry);
 		g_free(utf8entry);
blob - f8e5ff70df3b57d34bc77e3e515367f94581eb2f
blob + b6962d0e6b32f998e80d6480e9464ff04281de16
--- src/prefs_common.c
+++ src/prefs_common.c
@@ -898,9 +898,6 @@ static PrefParam param[] = {
 	{"folderview_vscrollbar_policy", "0",
 	 &prefs_common.folderview_vscrollbar_policy, P_ENUM,
 	 NULL, NULL, NULL},
-	{"textview_cursor_visible", "FALSE",
-	 &prefs_common.textview_cursor_visible, P_BOOL,
-	 NULL, NULL, NULL},
 	{"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
 	 NULL, NULL, NULL},
 
blob - b7e0d26b57ec290f5099887490d4499948c32312
blob + f92ea33d1b9a33763e03ec71553bd36c2da048f7
--- src/prefs_common.h
+++ src/prefs_common.h
@@ -354,7 +354,6 @@ struct _PrefsCommon
 	gint line_space;
 	gboolean render_html;
 	gboolean promote_html_part;
-	gboolean textview_cursor_visible;
 	gboolean enable_smooth_scroll;
 	gint scroll_step;
 	gboolean scroll_halfpage;
blob - 6e0d34665e2ed70dc50e65b5de5adf2bcf68f322
blob + 2a33bcd934a4e9fc293515419ada2c3d286bf4db
--- src/textview.c
+++ src/textview.c
@@ -555,8 +555,6 @@ void textview_reflect_prefs(TextView *textview)
 {
 	textview_set_font(textview, NULL);
 	textview_update_message_colors(textview);
-	gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview->text),
-					 prefs_common.textview_cursor_visible);
 }
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)