diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 2594793d2..4d119f7ae 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -90,6 +90,29 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEND_MULTIPLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="*/*" />
+            </intent-filter>
         </activity>
 
        <provider
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 85d643c04..d09c64c1e 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -46,8 +46,8 @@
 		<string>https</string>
 		<string>http</string>
 		<string>mailto</string>
-        <string>sms</string>
-        <string>tel</string>
+		<string>sms</string>
+		<string>tel</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
diff --git a/ios/TeamMailShareExtension/Info.plist b/ios/TeamMailShareExtension/Info.plist
index 37dc2904a..400268a43 100644
--- a/ios/TeamMailShareExtension/Info.plist
+++ b/ios/TeamMailShareExtension/Info.plist
@@ -26,6 +26,10 @@
 		<dict>
 			<key>NSExtensionActivationRule</key>
 			<dict>
+				<key>NSExtensionActivationSupportsFileWithMaxCount</key>
+				<integer>15</integer>
+				<key>NSExtensionActivationSupportsMovieWithMaxCount</key>
+				<integer>15</integer>
 				<key>NSExtensionActivationSupportsImageWithMaxCount</key>
 				<integer>15</integer>
 				<key>NSExtensionActivationSupportsText</key>
@@ -35,6 +39,7 @@
 			</dict>
 			<key>PHSupportedMediaTypes</key>
 			<array>
+				<string>Video</string>
 				<string>Image</string>
 			</array>
 		</dict>
diff --git a/ios/TeamMailShareExtension/ShareViewController.swift b/ios/TeamMailShareExtension/ShareViewController.swift
index a8de5498c..056b68707 100644
--- a/ios/TeamMailShareExtension/ShareViewController.swift
+++ b/ios/TeamMailShareExtension/ShareViewController.swift
@@ -12,6 +12,8 @@ class ShareViewController: SLComposeServiceViewController {
     let imageContentType = kUTTypeImage as String
     let textContentType = kUTTypeText as String
     let urlContentType = kUTTypeURL as String
+    let videoContentType = kUTTypeMovie as String
+    let fileURLType = kUTTypeFileURL as String
 
     override func isContentValid() -> Bool {
         return true
@@ -50,6 +52,10 @@ class ShareViewController: SLComposeServiceViewController {
                         handleText(content: content, attachment: attachment, index: index)
                     } else if attachment.hasItemConformingToTypeIdentifier(urlContentType) {
                         handleUrl(content: content, attachment: attachment, index: index)
+                    } else if attachment.hasItemConformingToTypeIdentifier(fileURLType) {
+                        handleFiles(content: content, attachment: attachment, index: index)
+                    } else if attachment.hasItemConformingToTypeIdentifier(videoContentType) {
+                        handleVideos(content: content, attachment: attachment, index: index)
                     }
                 }
             }
@@ -135,6 +141,66 @@ class ShareViewController: SLComposeServiceViewController {
             }
         }
     }
+    
+    private func handleVideos (content: NSExtensionItem, attachment: NSItemProvider, index: Int) {
+            attachment.loadItem(forTypeIdentifier: videoContentType, options: nil) { [weak self] data, error in
+
+                if error == nil, let url = data as? URL, let this = self {
+
+                    // Always copy
+                    let fileName = this.getFileName(from: url, type: .video)
+                    let newPath = FileManager.default
+                        .containerURL(forSecurityApplicationGroupIdentifier: this.appGroupId)!
+                        .appendingPathComponent(fileName)
+                    let copied = this.copyFile(at: url, to: newPath)
+                    if(copied) {
+                        guard let sharedFile = this.getSharedMediaFile(forVideo: newPath) else {
+                            return
+                        }
+                        this.sharedMedia.append(sharedFile)
+                    }
+
+                    // If this is the last item, save imagesData in userDefaults and redirect to host app
+                    if index == (content.attachments?.count)! - 1 {
+                        let userDefaults = UserDefaults(suiteName: this.appGroupId)
+                        userDefaults?.set(this.toData(data: this.sharedMedia), forKey: this.sharedKey)
+                        userDefaults?.synchronize()
+                        this.redirectToHostApp(type: .media)
+                    }
+
+                } else {
+                     self?.dismissWithError()
+                }
+            }
+        }
+
+        private func handleFiles (content: NSExtensionItem, attachment: NSItemProvider, index: Int) {
+            attachment.loadItem(forTypeIdentifier: fileURLType, options: nil) { [weak self] data, error in
+
+                if error == nil, let url = data as? URL, let this = self {
+
+                    // Always copy
+                    let fileName = this.getFileName(from :url, type: .file)
+                    let newPath = FileManager.default
+                        .containerURL(forSecurityApplicationGroupIdentifier: this.appGroupId)!
+                        .appendingPathComponent(fileName)
+                    let copied = this.copyFile(at: url, to: newPath)
+                    if (copied) {
+                        this.sharedMedia.append(SharedMediaFile(path: newPath.absoluteString, thumbnail: nil, duration: nil, type: .file))
+                    }
+
+                    if index == (content.attachments?.count)! - 1 {
+                        let userDefaults = UserDefaults(suiteName: this.appGroupId)
+                        userDefaults?.set(this.toData(data: this.sharedMedia), forKey: this.sharedKey)
+                        userDefaults?.synchronize()
+                        this.redirectToHostApp(type: .file)
+                    }
+
+                } else {
+                    self?.dismissWithError()
+                }
+            }
+        }
 
 
     private func dismissWithError() {