diff --git a/app/src/main/java/i2p/bote/android/provider/AttachmentProvider.java b/app/src/main/java/i2p/bote/android/provider/AttachmentProvider.java
index de66f1e..4632625 100644
--- a/app/src/main/java/i2p/bote/android/provider/AttachmentProvider.java
+++ b/app/src/main/java/i2p/bote/android/provider/AttachmentProvider.java
@@ -98,8 +98,14 @@ public class AttachmentProvider extends ContentProvider {
         if (sUriMatcher.match(uri) != UriMatcher.NO_MATCH) {
             try {
                 Part attachment = getAttachment(uri);
-                if (attachment != null)
-                    return attachment.getContentType();
+                if (attachment != null) {
+                    String contentType = attachment.getContentType();
+                    // Remove any "; name=fileName" suffix
+                    int delim = contentType.indexOf(';');
+                    if (delim >= 0)
+                        contentType = contentType.substring(0, delim);
+                    return contentType;
+                }
             } catch (PasswordException e) {
                 e.printStackTrace();
             } catch (IOException e) {