X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-view-window.c;h=f52eb00fce06bec49cb81a324868a9fc5c92dad6;hp=a2144a39de989c2d1ddcf7c29030b8e07dedf3ec;hb=3e6c4d5b3535ba6332fa256d3633931811b48b8d;hpb=f05f3bee660640d588296a7c388c1ca71c864324

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index a2144a3..f52eb00 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1634,9 +1634,16 @@ modest_msg_view_window_is_search_result (ModestMsgViewWindow *window)
 static gboolean
 msg_is_visible (TnyHeader *header, gboolean check_outbox)
 {
-	return (!(tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED)) &&
-		( (!check_outbox) || (modest_tny_all_send_queues_get_msg_status (header) != MODEST_TNY_SEND_QUEUE_FAILED)) ;
-	
+	if ((tny_header_get_flags(header) & TNY_HEADER_FLAG_DELETED))
+		return FALSE;
+	if (!check_outbox) {
+		return TRUE;
+	} else {
+		ModestTnySendQueueStatus status;
+		status = modest_tny_all_send_queues_get_msg_status (header);
+		return ((status != MODEST_TNY_SEND_QUEUE_FAILED) &&
+			(status != MODEST_TNY_SEND_QUEUE_SENDING));
+	}
 }
 
 gboolean