diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
index 330e4cb8a..21ab5fb00 100644
--- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
@@ -50,7 +50,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
 		final String mimeType = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
 		final int autoAcceptFileSize = mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize);
 		this.originalFileSize = FileBackend.getFileSize(mXmppConnectionService,uri);
-		this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/")) && originalFileSize > autoAcceptFileSize;
+		this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/")) && originalFileSize > autoAcceptFileSize && !"uncompressed".equals(getVideoCompression());
 	}
 
 	boolean isVideoMessage() {
@@ -108,7 +108,12 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
 		} catch (InterruptedException e) {
 			throw new AssertionError(e);
 		} catch (ExecutionException e) {
-			Log.d(Config.LOGTAG,"ignoring execution exception. Should get handled by onTranscodeFiled() instead",e);
+			if (e.getCause() instanceof Error) {
+				mXmppConnectionService.stopForcingForegroundNotification();
+				processAsFile();
+			} else {
+				Log.d(Config.LOGTAG, "ignoring execution exception. Should get handled by onTranscodeFiled() instead", e);
+			}
 		}
 	}
 
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index d5285e08a..54e122dad 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -116,10 +116,12 @@
 	<string-array name="video_compression_values">
 		<item>360</item>
 		<item>720</item>
+		<item>uncompressed</item>
 	</string-array>
 
 	<string-array name="video_compression_entries">
 		<item>@string/video_360p</item>
 		<item>@string/video_720p</item>
+		<item>@string/video_original</item>
 	</string-array>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f0fbe841e..306e29af5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -805,4 +805,5 @@
     <string name="no_market_app_installed">No market app installed.</string>
     <string name="group_chat_will_make_your_jabber_id_public">This group chat will make your Jabber ID public</string>
     <string name="ebook">e-book</string>
+    <string name="video_original">Original (uncompressed)</string>
 </resources>