fix: update message ids correctly

Fixes #1495

python/tests/test_account.py

@@ -7,6 +7,8 @@ from deltachat import const, Account
 from deltachat.message import Message
 from deltachat.hookspec import account_hookimpl
 from datetime import datetime, timedelta
+from deltachat import direct_imap
+from deltachat.direct_imap import make_direct_imap
 
 
 @pytest.mark.parametrize("msgtext,res", [
@@ -635,6 +637,83 @@ class TestOnlineAccount:
         ev_msg = ac1_clone._evtracker.wait_next_messages_changed()
         assert ev_msg.text == msg_out.text
 
+    @pytest.mark.parametrize('i', range(30))
+    def test_mark_read_on_server(self, acfactory, lp, i):
+        ac1 = acfactory.get_online_configuring_account()
+        ac2 = acfactory.get_online_configuring_account(mvbox=True, move=True)
+
+        ac1.wait_configure_finish()
+        ac1.start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+
+        imap2 = make_direct_imap(ac2, direct_imap.MVBOX)
+        # imap2.mark_all_read()
+        assert imap2.get_unread_cnt() == 0
+
+        chat = self.get_chat(ac1, ac2)
+        chat_on_ac2 = self.get_chat(ac2, ac1)
+
+        chat.send_text("Text message")
+
+        incoming_on_ac2 = ac2._evtracker.wait_next_incoming_message()
+        lp.sec("Incoming: "+incoming_on_ac2.text)
+
+        assert list(ac2.get_fresh_messages())
+
+        for i in range(0, 20):
+            if imap2.get_unread_cnt() == 1:
+                break
+            time.sleep(1)  # We might need to wait because Imaplib is slower than DC-Core
+        assert imap2.get_unread_cnt() == 1
+
+        chat_on_ac2.mark_noticed()
+        incoming_on_ac2.mark_seen()
+        ac2._evtracker.wait_next_messages_changed()
+
+        assert not list(ac2.get_fresh_messages())
+
+        # The new messages should be seen now.
+        for i in range(0, 20):
+            if imap2.get_unread_cnt() == 0:
+                break
+            time.sleep(1)  # We might need to wait because Imaplib is slower than DC-Core
+        assert imap2.get_unread_cnt() == 0
+
+    @pytest.mark.parametrize('i', range(30))
+    def test_mark_bcc_read_on_server(self, acfactory, lp, i):
+        ac1 = acfactory.get_online_configuring_account(mvbox=True, move=True)
+        ac2 = acfactory.get_online_configuring_account()
+
+        ac1.wait_configure_finish()
+        ac1.start_io()
+        ac2.wait_configure_finish()
+        ac2.start_io()
+
+        imap1 = make_direct_imap(ac1, direct_imap.MVBOX)
+        imap1.mark_all_read()
+        assert imap1.get_unread_cnt() == 0
+
+        chat = self.get_chat(ac1, ac2)
+
+        ac1.set_config("bcc_self", "1")
+        chat.send_text("Text message")
+
+        ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
+
+        for i in range(0, 20):
+            if imap1.get_new_email_cnt() == 1:
+                break
+            time.sleep(1)  # We might need to wait because Imaplib is slower than DC-Core
+        assert imap1.get_new_email_cnt() == 1
+
+        for i in range(0, 20):
+            if imap1.get_unread_cnt() == 0:
+                break
+            time.sleep(1)  # We might need to wait because Imaplib is slower than DC-Core
+
+        assert imap1.get_unread_cnt() == 0
+
     def test_send_file_twice_unicode_filename_mangling(self, tmpdir, acfactory, lp):
         ac1, ac2 = acfactory.get_two_online_accounts()
         chat = self.get_chat(ac1, ac2)