1 files changed, 2 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index d9a12392e..223e26dd2 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -85,8 +85,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
     private byte[] symmetricKey;
 
-    private Bookmark bookmark;
-
     private boolean messagesLeftOnServer = true;
     private ChatState mOutgoingChatState = Config.DEFAULT_CHATSTATE;
     private ChatState mIncomingChatState = Config.DEFAULT_CHATSTATE;
@@ -508,6 +506,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public String getName() {
         if (getMode() == MODE_MULTI) {
             final String subject = getMucOptions().getSubject();
+            Bookmark bookmark = getBookmark();
             final String bookmarkName = bookmark != null ? bookmark.getBookmarkName() : null;
 
             if (subject != null && !subject.trim().isEmpty()) {
@@ -826,20 +825,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return this.symmetricKey;
     }
 
-    public void setBookmark(Bookmark bookmark) {
-        this.bookmark = bookmark;
-        this.bookmark.setConversation(this);
-    }
-
-    public void deregisterWithBookmark() {
-        if (this.bookmark != null) {
-            this.bookmark.setConversation(null);
-        }
-        this.bookmark = null;
-    }
-
     public Bookmark getBookmark() {
-        return this.bookmark;
+        return this.account.getBookmark(this.contactJid);
     }
 
     public Message findDuplicateMessage(Message message) {