Show connection requested dialog when the message is not found

pmo-trunk-r754

diff --git a/src/modest-ui.c b/src/modest-ui.c
index 37daca0..084b781 100644 (file)
--- a/src/modest-ui.c
+++ b/src/modest-ui.c
@@ -711,7 +711,7 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
 
        helper = (GetMsgAsyncHelper *) user_data;
 
-       if (*err && ((*err)->code == TNY_FOLDER_ERROR_GET_MSG)) {
+       if ((*err && ((*err)->code == TNY_FOLDER_ERROR_GET_MSG)) || !msg) {
                ModestHeaderView *header_view;
                header_view = modest_widget_factory_get_header_view
                        (modest_runtime_get_widget_factory());
@@ -721,9 +721,6 @@ get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
                return;
        }
 
-       if (!msg)
-               return;
-
        /* Call user function */
        helper->func (msg, user_data);