do not cross reference bookmarks and conversations

1 files changed, 2 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 6c41187e0..21442bcd1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -396,8 +396,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         if (mConversation == null) {
             return true;
         }
-        Account account = mConversation.getAccount();
-        if (account.hasBookmarkFor(mConversation.getJid().toBareJid())) {
+        if (mConversation.getBookmark() != null) {
             menuItemSaveBookmark.setVisible(false);
             menuItemDeleteBookmark.setVisible(true);
         } else {
@@ -568,7 +567,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void deleteBookmark() {
         Account account = mConversation.getAccount();
         Bookmark bookmark = mConversation.getBookmark();
-        mConversation.deregisterWithBookmark();
+        bookmark.setConversation(null);
         account.getBookmarks().remove(bookmark);
         xmppConnectionService.pushBookmarks(account);
         updateView();