1 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 02725991b..3af13399a 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1742,7 +1742,7 @@ public class XmppConnectionService extends Service {
 					);
 				}
 			}
-			this.databaseBackend.updateConversation(conversation);
+            updateConversation(conversation);
 			this.conversations.remove(conversation);
 			updateConversationUi();
 		}
@@ -2272,7 +2272,7 @@ public class XmppConnectionService extends Service {
 				}
 				pushBookmarks(conversation.getAccount());
 			}
-			databaseBackend.updateConversation(conversation);
+            updateConversation(conversation);
 			joinMuc(conversation);
 		}
 	}
@@ -2992,8 +2992,13 @@ public class XmppConnectionService extends Service {
 		}
 	}
 
-	public void updateConversation(Conversation conversation) {
-		this.databaseBackend.updateConversation(conversation);
+    public void updateConversation(final Conversation conversation) {
+        mDatabaseExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                databaseBackend.updateConversation(conversation);
+            }
+        });
 	}
 
 	private void reconnectAccount(final Account account, final boolean force, final boolean interactive) {