diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index c66220ab55af42850aa88edc7216d7c0008c3765..6437cffa338882a4740c4b3f3b488239532429fc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -22,7 +22,6 @@ import java.util.Locale;
 import java.util.Objects;
 
 import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
 import eu.siacs.conversations.android.AbstractPhoneContact;
 import eu.siacs.conversations.android.JabberIdContact;
 import eu.siacs.conversations.services.QuickConversationsService;
@@ -544,7 +543,7 @@ public class Contact implements ListItem, Blockable {
     public synchronized boolean unsetPhoneContact(Class<? extends AbstractPhoneContact> clazz) {
         resetOption(getOption(clazz));
         boolean changed = false;
-        if (!getOption(Options.SYNCED_VIA_ADDRESSBOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
+        if (!getOption(Options.SYNCED_VIA_ADDRESS_BOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
             setSystemAccount(null);
             changed |= setPhotoUri(null);
             changed |= setSystemName(null);
@@ -554,7 +553,7 @@ public class Contact implements ListItem, Blockable {
 
     public static int getOption(Class<? extends AbstractPhoneContact> clazz) {
         if (clazz == JabberIdContact.class) {
-            return Options.SYNCED_VIA_ADDRESSBOOK;
+            return Options.SYNCED_VIA_ADDRESS_BOOK;
         } else {
             return Options.SYNCED_VIA_OTHER;
         }
@@ -593,7 +592,7 @@ public class Contact implements ListItem, Blockable {
         public static final int PENDING_SUBSCRIPTION_REQUEST = 5;
         public static final int DIRTY_PUSH = 6;
         public static final int DIRTY_DELETE = 7;
-        private static final int SYNCED_VIA_ADDRESSBOOK = 8;
+        private static final int SYNCED_VIA_ADDRESS_BOOK = 8;
         public static final int SYNCED_VIA_OTHER = 9;
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 73b8dfc7c3aa3ba6be4e69ab37cec8fd986635d4..9149862e6f057f9142ef93b3335db07d8f846732 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1175,13 +1175,12 @@ public class ConversationFragment extends XmppFragment
                     menuCall.setVisible(false);
                 } else {
                     menuOngoingCall.setVisible(false);
-                    final RtpCapability.Capability rtpCapability =
-                            RtpCapability.check(conversation.getContact());
+                    // use RtpCapability.check(conversation.getContact()); to check if contact
+                    // actually has support
                     final boolean cameraAvailable =
                             activity != null && activity.isCameraFeatureAvailable();
-                    menuCall.setVisible(rtpCapability != RtpCapability.Capability.NONE);
-                    menuVideoCall.setVisible(
-                            rtpCapability == RtpCapability.Capability.VIDEO && cameraAvailable);
+                    menuCall.setVisible(true);
+                    menuVideoCall.setVisible(cameraAvailable);
                 }
                 menuContactDetails.setVisible(!this.conversation.withSelf());
                 menuMucDetails.setVisible(false);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
index b53f0b9e8d519d55024c00da4a8f680f2c38c486..1b41285999ae2b0dcca084f253fa77ecf4f9d237 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
@@ -64,7 +64,7 @@ public class RtpCapability {
 
     public static Capability check(final Contact contact, final boolean allowFallback) {
         final Presences presences = contact.getPresences();
-        if (presences.size() == 0 && allowFallback && contact.getAccount().isEnabled()) {
+        if (presences.isEmpty() && allowFallback && contact.getAccount().isEnabled()) {
             return contact.getRtpCapability();
         }
         Capability result = Capability.NONE;