* check for a valid foldername

[modest] / src / widgets / modest-msg-view.c

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index 6f61812..de775b1 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -831,7 +831,11 @@ html_adjustment_changed (GtkAdjustment *adj,
        gboolean vadj_changed;
        gint new_height;
 
+       g_signal_stop_emission_by_name (G_OBJECT (adj), "changed");
+
        priv->html_scroll->requisition.height = html_vadj->upper;
+       if (html_vadj->upper == priv->html_scroll->allocation.height)
+               return;
        priv->html_scroll->allocation.height = html_vadj->upper;
 
        set_vadjustment_values (msg_view, &vadj_changed);
@@ -1647,7 +1651,7 @@ idle_readjust_scroll (ModestMsgView *view)
                ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (view);
                GtkAdjustment *html_vadj;
                html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
-               html_vadj->upper = html_vadj->page_size;
+               html_vadj->page_size = html_vadj->upper;
                gtk_adjustment_changed (html_vadj);
                gtk_widget_queue_resize (GTK_WIDGET (view));
                gtk_widget_queue_draw (GTK_WIDGET (view));