Merge branch 'undo-manager' into next

[sup] / bin / sup-sync

diff --git a/bin/sup-sync b/bin/sup-sync
index 5437f9caa23bf41ce8989a249eabeda68f0b8b4b..91710d47495ab263a69e03ec709657d1ee8b66ae 100644 (file)
--- a/bin/sup-sync
+++ b/bin/sup-sync
@@ -158,7 +158,7 @@ begin
       ## assign message labels based on the operation we're performing
       case op
       when :asis
-        m.labels = (m.labels + index_state).uniq if index_state
+        m.labels = ((m.labels - [:unread, :inbox]) + index_state).uniq if index_state
       when :restore
         ## if the entry exists on disk
         if restored_state[m.id]