X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window-mgr.c;h=a24f2ad9bd9de78ae2362ab0e7532b5b52f48fa4;hp=46db0f04bb8216773e9f177ce5184fb4ef2eabdf;hb=d098e6745f49277f857e672500a2df4a8beaca20;hpb=ad22f66c880fef5504167946fc6c9f40756213c2

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 46db0f0..a24f2ad 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -592,7 +592,13 @@ modest_hildon2_window_mgr_register_window (ModestWindowMgr *self,
 	}
 
 	/* Show toolbar always */
-	modest_window_show_toolbar (window, TRUE);
+	if (MODEST_MSG_EDIT_WINDOW (window)) {
+		gboolean show_toolbar;
+		show_toolbar = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL);
+		modest_window_show_toolbar (window, show_toolbar);
+	} else {
+		modest_window_show_toolbar (window, TRUE);
+	}
 
 	return TRUE;
 fail: