diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index e76c19875a6de972c9f67bc83bf34581a97d2a21..f33b93fe8569ce1c6c73a9d6b87e52c295739040 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -1503,9 +1503,13 @@ private class Geary.ImapEngine.MinimalFolder : Geary.Folder, Geary.FolderSupport
                     changed_map.set(e.id, e.email_flags);
             }
 
-            if (!cancellable.is_cancelled() && changed_map.size > 0)
+            if (!cancellable.is_cancelled() && changed_map.size > 0) {
                 notify_email_flags_changed(changed_map);
 
+                // Also update local folder 
+                yield local_folder.set_email_flags_async(changed_map as Gee.Map<ImapDB.EmailIdentifier, EmailFlags>, null);
+            }
+
             chunk_size *= 2;
             if (chunk_size > FLAG_UPDATE_MAX_CHUNK) {
                 chunk_size = FLAG_UPDATE_MAX_CHUNK;