1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java
index ffd904e5e..cfb982c0f 100644
--- a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java
@@ -127,14 +127,14 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
                 R.menu.manageaccounts_context, menu);
         AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
         this.selectedAccount = accountList.get(acmi.position);
-        if (this.selectedAccount.isOptionSet(Account.OPTION_DISABLED)) {
+        if (this.selectedAccount.isEnabled()) {
+            menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(Config.supportOpenPgp());
+            menu.findItem(R.id.mgmt_account_change_presence).setVisible(manuallyChangePresence());
+        } else {
             menu.findItem(R.id.mgmt_account_reconnect).setVisible(false);
             menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(false);
             menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false);
             menu.findItem(R.id.mgmt_account_change_presence).setVisible(false);
-        } else {
-            menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(Config.supportOpenPgp());
-            menu.findItem(R.id.mgmt_account_change_presence).setVisible(manuallyChangePresence());
         }
         menu.setHeaderTitle(this.selectedAccount.getJid().toBareJid().toString());
     }
@@ -265,7 +265,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         List<Account> list = new ArrayList<>();
         synchronized (this.accountList) {
             for (Account account : this.accountList) {
-                if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+                if (account.isEnabled()) {
                     list.add(account);
                 }
             }
@@ -278,7 +278,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
     private boolean accountsLeftToDisable() {
         synchronized (this.accountList) {
             for (Account account : this.accountList) {
-                if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+                if (account.isEnabled()) {
                     return true;
                 }
             }
@@ -289,7 +289,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
     private boolean accountsLeftToEnable() {
         synchronized (this.accountList) {
             for (Account account : this.accountList) {
-                if (account.isOptionSet(Account.OPTION_DISABLED)) {
+                if (!account.isEnabled()) {
                     return true;
                 }
             }
@@ -301,7 +301,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
         List<Account> list = new ArrayList<>();
         synchronized (this.accountList) {
             for (Account account : this.accountList) {
-                if (account.isOptionSet(Account.OPTION_DISABLED)) {
+                if (!account.isEnabled()) {
                     list.add(account);
                 }
             }