diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
index b11340984..d481dd062 100644
--- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
@@ -566,8 +566,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     } else if (itemId == R.id.menu_show_map) {
       WebxdcActivity.openMaps(this, chatId);
       return true;
-    } else if (itemId == R.id.menu_start_call) {
-      CallUtil.startCall(this, chatId);
+    } else if (itemId == R.id.menu_start_audio_call) {
+      CallUtil.startCall(this, chatId, true);
+      return true;
+    } else if (itemId == R.id.menu_start_video_call) {
+      CallUtil.startCall(this, chatId, false);
       return true;
     } else if (itemId == R.id.menu_all_media) {
       handleAllMedia();
diff --git a/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java b/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
index f84e2385b..b1494f786 100644
--- a/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
+++ b/src/main/java/org/thoughtcrime/securesms/calls/CallUtil.java
@@ -18,19 +18,19 @@ import java.nio.charset.StandardCharsets;
 public class CallUtil {
   private static final String TAG = CallUtil.class.getSimpleName();
 
-  public static void startCall(Activity activity, int chatId) {
+  public static void startCall(Activity activity, int chatId, boolean audioOnly) {
     Permissions.with(activity)
       .request(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)
       .ifNecessary()
       .withPermanentDenialDialog(activity.getString(R.string.perm_explain_access_to_camera_denied))
       .onAllGranted(() -> {
           int accId = DcHelper.getContext(activity).getAccountId();
-          startCall(activity, accId, chatId);
+          startCall(activity, accId, chatId, audioOnly);
         })
       .execute();
   }
 
-  public static void startCall(Context context, int accId, int chatId) {
+  public static void startCall(Context context, int accId, int chatId, boolean audioOnly) {
     Intent intent = new Intent(context, CallActivity.class);
     intent.setAction(Intent.ACTION_VIEW);
     intent.putExtra(CallActivity.EXTRA_ACCOUNT_ID, accId);
diff --git a/src/main/res/menu/conversation.xml b/src/main/res/menu/conversation.xml
index cbe09e6f7..678d48f3d 100644
--- a/src/main/res/menu/conversation.xml
+++ b/src/main/res/menu/conversation.xml
@@ -26,9 +26,20 @@
         app:showAsAction="always"/>
 
     <item android:id="@+id/menu_start_call"
-        android:title="@string/start_call"
-        android:icon="@drawable/baseline_call_24"
-        app:showAsAction="always" />
+          android:title="@string/start_call"
+          app:showAsAction="always"
+          android:icon="@drawable/baseline_call_24">
+      <menu>
+        <item android:id="@+id/menu_start_audio_call"
+              android:title="@string/start_audio_call"
+              android:icon="@drawable/baseline_call_24"
+              />
+        <item android:id="@+id/menu_start_video_call"
+              android:title="@string/start_video_call"
+              android:icon="@drawable/ic_videocam_white_24dp"
+              />
+        </menu>
+    </item>
 
     <item android:id="@+id/menu_all_media"
         android:title="@string/apps_and_media"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d611028b6..dc5f359b8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -380,6 +380,8 @@
 
     <!-- the action "to call someone", used as a tooltip for the "phone" icon. not: "the call" -->
     <string name="start_call">Call</string>
+    <string name="start_audio_call">Audio Call</string>
+    <string name="start_video_call">Video Call</string>
     <!-- the action "to answer" or to "accept" or to "pick up" a call. not: "the answer" -->
     <string name="answer_call">Answer</string>
     <!-- the action "to decline" a call, not: "the decline" -->