diff --git a/src/client/conversation-viewer/conversation-viewer.vala b/src/client/conversation-viewer/conversation-viewer.vala
index 33a86fb7..99fbb589 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -419,6 +419,7 @@ public class ConversationViewer : Gtk.Box {
     
     private void on_folder_selected(Geary.Folder? folder) {
         hide_special_message();
+        cancel_load();
         
         current_folder = folder;
         email_store = (current_folder == null ? null : new Geary.App.EmailStore(current_folder.account));