diff --git a/lib/msgstore.go b/lib/msgstore.go
index 5655f9e..33c2439 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -209,7 +209,9 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
 		}
 		store.Messages = newMap
 		store.uids = msg.Uids
-		store.runThreadBuilderNow()
+		if store.threadedView {
+			store.runThreadBuilderNow()
+		}
 	case *types.DirectoryThreaded:
 		var uids []uint32
 		newMap := make(map[uint32]*models.MessageInfo)