fix some more NPE

2 files changed, 4 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index cea89ebb4..bcdcafe37 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -1022,6 +1022,9 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     private boolean AdHocInvite(Account account) {
+        if (!xmppConnectionServiceBound) {
+            return false;
+        }
         XmppConnection.Features features = account.getXmppConnection().getFeatures();
         Log.d(Config.LOGTAG, "Invite available: " + features.adhocinvite);
         return features.adhocinvite;
diff --git a/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java b/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java
index 7775bc114..aaf2a39ec 100644
--- a/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java
+++ b/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java
@@ -127,7 +127,7 @@ public final class MucDetailsContextMenuHelper {
             sendPrivateMessage.setEnabled(mucOptions.allowPm());
         } else {
             sendPrivateMessage.setVisible(true);
-            sendPrivateMessage.setVisible(!isGroupChat && mucOptions.allowPm() && (user != null && user.getRole().ranks(MucOptions.Role.VISITOR)));
+            sendPrivateMessage.setEnabled(user != null && mucOptions.allowPm() && user.getRole().ranks(MucOptions.Role.VISITOR));
         }
     }