[geary/wip/713150-conversations] Fix corner case with load more & conversation monitor

[Jim Nelson <jnelson src gnome org>]

commit e436006c0f2fea817af1ee53f6b1f0a589a096ea
Author: Jim Nelson <jim yorba org>
Date:   Wed Mar 18 13:41:35 2015 -0700

    Fix corner case with load more & conversation monitor

 src/engine/app/app-conversation-monitor.vala |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/engine/app/app-conversation-monitor.vala b/src/engine/app/app-conversation-monitor.vala
index ebc779c..d69c558 100644
--- a/src/engine/app/app-conversation-monitor.vala
+++ b/src/engine/app/app-conversation-monitor.vala
@@ -869,11 +869,8 @@ public class Geary.App.ConversationMonitor : BaseObject {
         if (reschedule && expected_more_email)
             reschedule = initial_message_count != get_email_count();
         
-        // as stated in third condition, possible for email_total to be incorrect, so use both to
-        // check if all mail has been loaded
-        if (folder.properties.email_total <= primary_email_id_to_conversation.size)
-            all_mail_loaded = true;
-        else if (expected_more_email && initial_message_count == get_email_count())
+         // Although possible for email_total to be incorrect, be stricter for this flag
+       if (folder.properties.email_total <= primary_email_id_to_conversation.size)
             all_mail_loaded = true;
         
         if (reschedule)