diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b42a76db9..713affbf89 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,6 +70,7 @@
                 <data android:mimeType="audio/*" />
                 <data android:mimeType="image/*" />
                 <data android:mimeType="text/*" />
+                <data android:mimeType="video/*" />
             </intent-filter>            
 
         </activity>
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index 938879e6ea..b405fa031a 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -138,6 +138,7 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
   public static final String DRAFT_TEXT_EXTRA        = "draft_text";
   public static final String DRAFT_IMAGE_EXTRA       = "draft_image";
   public static final String DRAFT_AUDIO_EXTRA       = "draft_audio";
+  public static final String DRAFT_VIDEO_EXTRA       = "draft_video";
   public static final String DISTRIBUTION_TYPE_EXTRA = "distribution_type";
 
   private static final int PICK_CONTACT      = 1;
@@ -621,12 +622,14 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
     String draftText  = getIntent().getStringExtra(DRAFT_TEXT_EXTRA);
     Uri    draftImage = getIntent().getParcelableExtra(DRAFT_IMAGE_EXTRA);
     Uri    draftAudio = getIntent().getParcelableExtra(DRAFT_AUDIO_EXTRA);
+    Uri    draftVideo = getIntent().getParcelableExtra(DRAFT_VIDEO_EXTRA);
 
     if (draftText != null)  composeText.setText(draftText);
     if (draftImage != null) addAttachmentImage(draftImage);
     if (draftAudio != null) addAttachmentAudio(draftAudio);
+    if (draftVideo != null) addAttachmentVideo(draftVideo);
 
-    if (draftText == null && draftImage == null && draftAudio == null) {
+    if (draftText == null && draftImage == null && draftAudio == null && draftVideo == null) {
       initializeDraftFromDatabase();
     }
   }
diff --git a/src/org/thoughtcrime/securesms/RoutingActivity.java b/src/org/thoughtcrime/securesms/RoutingActivity.java
index 046898f6fb..83c3675df5 100644
--- a/src/org/thoughtcrime/securesms/RoutingActivity.java
+++ b/src/org/thoughtcrime/securesms/RoutingActivity.java
@@ -148,6 +148,7 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     intent.putExtra(ConversationActivity.DRAFT_TEXT_EXTRA, parameters.draftText);
     intent.putExtra(ConversationActivity.DRAFT_IMAGE_EXTRA, parameters.draftImage);
     intent.putExtra(ConversationActivity.DRAFT_AUDIO_EXTRA, parameters.draftAudio);
+    intent.putExtra(ConversationActivity.DRAFT_VIDEO_EXTRA, parameters.draftVideo);
 
     return intent;
   }
@@ -207,7 +208,7 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
       recipients = null;
     }
 
-    return new ConversationParameters(threadId, recipients, null, null, null);
+    return new ConversationParameters(threadId, recipients, null, null, null, null);
   }
 
   private ConversationParameters getConversationParametersForShareAction() {
@@ -215,6 +216,7 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     String draftText = null;
     Uri draftImage   = null;
     Uri draftAudio   = null;
+    Uri draftVideo   = null;
 
     if ("text/plain".equals(type)) {
       draftText = getIntent().getStringExtra(Intent.EXTRA_TEXT);
@@ -222,16 +224,18 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
       draftImage = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
     } else if (type.startsWith("audio/")) {
       draftAudio = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+    } else if (type.startsWith("video/")) {
+      draftVideo = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
     }
 
-    return new ConversationParameters(-1, null, draftText, draftImage, draftAudio);
+    return new ConversationParameters(-1, null, draftText, draftImage, draftAudio, draftVideo);
   }
 
   private ConversationParameters getConversationParametersForInternalAction() {
     long threadId         = getIntent().getLongExtra("thread_id", -1);
     Recipients recipients = getIntent().getParcelableExtra("recipients");
 
-    return new ConversationParameters(threadId, recipients, null, null, null);
+    return new ConversationParameters(threadId, recipients, null, null, null, null);
   }
 
   private boolean isShareAction() {
@@ -248,15 +252,17 @@ public class RoutingActivity extends PassphraseRequiredSherlockActivity {
     public final String     draftText;
     public final Uri        draftImage;
     public final Uri        draftAudio;
+    public final Uri        draftVideo;
 
     public ConversationParameters(long thread, Recipients recipients,
-                                  String draftText, Uri draftImage, Uri draftAudio)
+                                  String draftText, Uri draftImage, Uri draftAudio, Uri draftVideo)
     {
      this.thread     = thread;
      this.recipients = recipients;
      this.draftText  = draftText;
      this.draftImage = draftImage;
      this.draftAudio = draftAudio;
+     this.draftVideo = draftVideo;
     }
   }