[geary/wip/765516-gtk-widget-conversation-viewer: 83/112] Fix a crash when viewer is cleared while highlighting search terms.

[Michael Gratton <mjog src gnome org>]

commit 449088355df3b5ee13760beb1ee7ed01fa93d958
Author: Michael James Gratton <mike vee net>
Date:   Mon Jul 11 12:46:00 2016 +1000

    Fix a crash when viewer is cleared while highlighting search terms.

 .../conversation-viewer/conversation-viewer.vala   |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-viewer.vala 
b/src/client/conversation-viewer/conversation-viewer.vala
index 427b760..e0fb3d1 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -555,17 +555,17 @@ public class ConversationViewer : Gtk.Stack {
                 add_email(email, conversation.is_in_current_folder(email.id));
         }
 
+        // Ensure the last email is always shown
+        Gtk.ListBoxRow last_row =
+            conversation_listbox.get_row_at_index(emails.size - 1);
+        expand_email(last_row, false);
+
         if (current_folder is Geary.SearchFolder) {
             yield highlight_search_terms();
         } else {
             compress_emails();
         }
 
-        // Ensure the last email is always shown
-        Gtk.ListBoxRow last_row =
-            conversation_listbox.get_row_at_index(emails.size - 1);
-        expand_email(last_row, false);
-
         loading_conversations = false;
         if (state == ViewState.CONVERSATION) {
             debug("Emails loaded\n");