X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-edit-window.c;h=3f4e51409bfeb53ddf74619dfdb820a4ed4fa11a;hb=cc351a65e779c443ea59bc6348bc5aed675a1a14;hp=d320080efc4afac741509805de184ddb7d81e251;hpb=f8dcadd42eaab5fdf1b44f009f144fcb9585856a;p=modest

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index d320080..3f4e514 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -87,7 +87,7 @@
 #define DEFAULT_FONT_SIZE 3
 #define DEFAULT_FONT 2
 #define DEFAULT_SIZE_BUTTON_FONT_FAMILY "Sans"
-#define DEFAULT_MAIN_VBOX_SPACING 6
+#define DEFAULT_MAIN_VBOX_SPACING 0
 #define SUBJECT_MAX_LENGTH 1000
 #define IMAGE_MAX_WIDTH 560
 #define DEFAULT_FONT_SCALE 1.5
@@ -3251,12 +3251,26 @@ void
 modest_msg_edit_window_undo (ModestMsgEditWindow *window)
 {
 	ModestMsgEditWindowPrivate *priv;
+	ModestWindowPrivate *parent_priv;
+	gboolean was_rich_text, is_rich_text;
 
 	g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 	priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
-	
+	parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
+
+	was_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
 	wp_text_buffer_undo (WP_TEXT_BUFFER (priv->text_buffer));
 
+	is_rich_text = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer));
+
+	if (parent_priv->toolbar && was_rich_text != is_rich_text) {
+		if (is_rich_text)
+			gtk_widget_show (parent_priv->toolbar);
+		else
+			gtk_widget_hide (parent_priv->toolbar);
+	}
+
 	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window));
 	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window));
 }