Reset unsnoozed indicator

app/src/main/java/eu/faircode/email/FragmentMessages.java

@@ -6894,13 +6894,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                     List<EntityMessage> messages = db.message().getMessagesByThread(
                             account, thread, threading ? null : id, null);
-                    for (EntityMessage threaded : messages) {
-                        db.message().setMessageSnoozed(threaded.id, wakeup);
-                        db.message().setMessageUiIgnored(threaded.id, true);
-                        if (!hide && flag_snoozed && threaded.folder.equals(message.folder))
-                            EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
-                        EntityMessage.snooze(context, threaded.id, wakeup);
-                    }
+                    for (EntityMessage threaded : messages)
+                        if (threaded.ui_unsnoozed && wakeup == null)
+                            db.message().setMessageUnsnoozed(threaded.id, false);
+                        else {
+                            db.message().setMessageSnoozed(threaded.id, wakeup);
+                            db.message().setMessageUiIgnored(threaded.id, true);
+                            if (!hide && flag_snoozed && threaded.folder.equals(message.folder))
+                                EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
+                            EntityMessage.snooze(context, threaded.id, wakeup);
+                        }
 
                     db.setTransactionSuccessful();
                 } finally {
@@ -6958,13 +6961,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
                         List<EntityMessage> messages = db.message().getMessagesByThread(
                                 message.account, message.thread, threading ? null : id, message.folder);
-                        for (EntityMessage threaded : messages) {
-                            db.message().setMessageSnoozed(threaded.id, wakeup);
-                            db.message().setMessageUiIgnored(message.id, true);
-                            if (flag_snoozed && threaded.folder.equals(message.folder))
-                                EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
-                            EntityMessage.snooze(context, threaded.id, wakeup);
-                        }
+                        for (EntityMessage threaded : messages)
+                            if (threaded.ui_unsnoozed && wakeup == null)
+                                db.message().setMessageUnsnoozed(threaded.id, false);
+                            else {
+                                db.message().setMessageSnoozed(threaded.id, wakeup);
+                                db.message().setMessageUiIgnored(message.id, true);
+                                if (flag_snoozed && threaded.folder.equals(message.folder))
+                                    EntityOperation.queue(context, threaded, EntityOperation.FLAG, wakeup != null);
+                                EntityMessage.snooze(context, threaded.id, wakeup);
+                            }
                     }
 
                     db.setTransactionSuccessful();