diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index df3b63bf9db796546c0fd702eabc26a641b45302..16412c9854f281232e429e199ece17bbd608b962 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -570,7 +570,7 @@ public class FileBackend {
     }
 
     public void copyFileToPrivateStorage(Message message, Uri uri, String type) throws FileCopyException {
-        String mime = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
+        String mime = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
         Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime=" + mime + ")");
         String extension = MimeUtils.guessExtensionFromMimeType(mime);
         if (extension == null) {
diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
index 506d812dd6ec0ab2166d4bef9c082fa79c208197..330e4cb8a7685b3f6810a0654abc873ca7ac0f34 100644
--- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
@@ -47,7 +47,7 @@ public class AttachFileToConversationRunnable implements Runnable, MediaTranscod
 		this.mXmppConnectionService = xmppConnectionService;
 		this.message = message;
 		this.callback = callback;
-		final String mimeType = type != null ? type : MimeUtils.guessMimeTypeFromUri(mXmppConnectionService, uri);
+		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;
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
index 0b139c0e6f8564d2fc04c3f6e5fb573f05c1e4ef..5dce21e9543365309efbbd588f99d73f7c53a4fc 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
@@ -337,6 +337,7 @@ public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
 			query.getConversation().setFirstMamReference(first == null ? null : first.getContent());
 		}
 		if (complete || relevant == null || abort) {
+			//TODO: FIX done logic to look at complete. using count is probably unreliable because it can be ommited and doesn’t work with paging.
 			boolean done;
 			if (query.isCatchup()) {
 				done = false;
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
index 8adb55415409cf35cbf84b5a082761a0970cef19..63d9b2447f4d9038a31a14465f52e07da59a81e0 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java
@@ -77,6 +77,8 @@ public class MediaAdapter extends RecyclerView.Adapter<MediaAdapter.MediaViewHol
                 attr = R.attr.media_preview_app;
             } else if (mime.equals("application/zip") || mime.equals("application/rar")) {
                 attr = R.attr.media_preview_archive;
+            } else if (mime.equals("application/epub+zip") || mime.equals("application/vnd.amazon.mobi8-ebook")) {
+                attr = R.attr.media_preview_ebook;
             } else if (DOCUMENT_MIMES.contains(mime)) {
                 attr = R.attr.media_preview_document;
             } else {
diff --git a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
index a4ed47fdb0e1c0f1cca258e9c39a980b85c7e16a..4a13be151018585c1e996eff31701a13d2427d5f 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java
@@ -142,13 +142,13 @@ public class Attachment implements Parcelable {
                 for (int i = 0; i < clipData.getItemCount(); ++i) {
                     final Uri uri = clipData.getItemAt(i).getUri();
                     Log.d(Config.LOGTAG,"uri="+uri+" contentType="+contentType);
-                    final String mime = contentType != null ? contentType : MimeUtils.guessMimeTypeFromUri(context, uri);
+                    final String mime = MimeUtils.guessMimeTypeFromUriAndMime(context, uri, contentType);
                     Log.d(Config.LOGTAG,"mime="+mime);
                     uris.add(new Attachment(uri, type, mime));
                 }
             }
         } else {
-            final String mime = contentType != null ? contentType : MimeUtils.guessMimeTypeFromUri(context, data);
+            final String mime = MimeUtils.guessMimeTypeFromUriAndMime(context, data, contentType);
             uris.add(new Attachment(data, type, mime));
         }
         return uris;
diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
index a90fee07a06141385e925371a6f581e06966c2bf..7fecc8fc842ee402381c48afebf0e0fe9ff06b07 100644
--- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java
@@ -16,6 +16,7 @@
 package eu.siacs.conversations.utils;
 import android.content.Context;
 import android.net.Uri;
+import android.util.Log;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -26,6 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Transferable;
 
 /**
@@ -49,6 +51,7 @@ public final class MimeUtils {
         // by guessExtensionFromMimeType.
         add("application/andrew-inset", "ez");
         add("application/dsptype", "tsp");
+        add("application/epub+zip","pub");
         add("application/hta", "hta");
         add("application/mac-binhex40", "hqx");
         add("application/mathematica", "nb");
@@ -64,6 +67,9 @@ public final class MimeUtils {
         add("application/rdf+xml", "rdf");
         add("application/rss+xml", "rss");
         add("application/zip", "zip");
+        add("application/vnd.amazon.mobi8-ebook","azw3");
+        add("application/vnd.amazon.mobi8-ebook","azw");
+        add("application/vnd.amazon.mobi8-ebook","kfx");
         add("application/vnd.android.package-archive", "apk");
         add("application/vnd.cinderella", "cdy");
         add("application/vnd.ms-pki.stl", "stl");
@@ -493,6 +499,19 @@ public final class MimeUtils {
         return mimeTypeToExtensionMap.get(mimeType.split(";")[0]);
     }
 
+    public static String guessMimeTypeFromUriAndMime(final Context context, final Uri uri, final String mime) {
+        Log.d(Config.LOGTAG,"guessMimeTypeFromUriAndMime "+uri+" and mime="+mime);
+        if (mime == null || mime.equals("application/octet-stream")) {
+            final String guess = guessMimeTypeFromUri(context, uri);
+            if (guess != null) {
+                return guess;
+            } else {
+                return mime;
+            }
+        }
+        return guessMimeTypeFromUri(context ,uri);
+    }
+
     public static String guessMimeTypeFromUri(Context context, Uri uri) {
         // try the content resolver
         String mimeType;
@@ -502,11 +521,14 @@ public final class MimeUtils {
             mimeType = null;
         }
         // try the extension
-        if (mimeType == null && uri.getPath() != null) {
+        if ((mimeType == null || mimeType.equals("application/octet-stream")) && uri.getPath() != null) {
             String path = uri.getPath();
             int start = path.lastIndexOf('.') + 1;
             if (start < path.length()) {
-                mimeType = MimeUtils.guessMimeTypeFromExtension(path.substring(start));
+                final String guess = MimeUtils.guessMimeTypeFromExtension(path.substring(start));
+                if (guess != null) {
+                    mimeType = guess;
+                }
             }
         }
         // sometimes this works (as with the commit content api)
diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index daee298fcb9798a1cf5ebe027bf83f03ee0c0944..d7afd2bbcb58f53906a1e37705ffeb948a8ddaca 100644
--- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
@@ -482,6 +482,8 @@ public class UIHelper {
 			return context.getString(R.string.apk);
 		} else if (mime.contains("vcard")) {
 			return context.getString(R.string.vcard);
+		} else if (mime.equals("application/epub+zip") || mime.equals("application/vnd.amazon.mobi8-ebook")) {
+			return context.getString(R.string.ebook);
 		} else {
 			return mime;
 		}
diff --git a/src/main/res/drawable-hdpi/ic_book_black_48dp.png b/src/main/res/drawable-hdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fa172d245a7ad0c6212e934241602ad6e4fa2da
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_book_black_48dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_book_white_48dp.png b/src/main/res/drawable-hdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d181a32150bcf934b86306b219750398149c9220
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_book_white_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_book_black_48dp.png b/src/main/res/drawable-mdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..00f29d339f7c4ca43dd9c8adf4e39d4dacf05655
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_book_black_48dp.png differ
diff --git a/src/main/res/drawable-mdpi/ic_book_white_48dp.png b/src/main/res/drawable-mdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a5ee30413ad39c997b57f58a6e150ec9d5eb729
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_book_white_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd3412ce6afd8e67b95376635d5793f54211ca35
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_book_black_48dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..938eff46c509d0011f7d3c90694fe147c97de8ae
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_book_white_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4437d17c29bd7842232707aebc0b5a8beee100
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_book_black_48dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..059b0e65b4493fe5f482f8c39a49ac16764e9ff5
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_book_white_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png b/src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7bac608b5748ae3eefcd82cc96c08eb24862636
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_book_black_48dp.png differ
diff --git a/src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..12f649c036c88d3bcecefd2d01b787d5e93c4eec
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_book_white_48dp.png differ
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 7fbeaf5b30daacca389b8ea64612619542a04589..47ae372ebc5196fe9e9f01356b2c4d2d7f20fb98 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -61,6 +61,7 @@
     <attr name="media_preview_app" format="reference"/>
     <attr name="media_preview_calendar" format="reference"/>
     <attr name="media_preview_archive" format="reference" />
+    <attr name="media_preview_ebook" format="reference"/>
     <attr name="media_preview_unknown" format="reference" />
 
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index dd616212f4c80532e3b888bfdb385ee18e7cb877..f0fbe841e23f6369fa3e5417342b9aa75dc89bc9 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -804,4 +804,5 @@
     <string name="start_orbot">Start Orbot</string>
     <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>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5532817e975f9affb7cdccfad6835b3ce85a1a79..70841d0571ae4353e8ae7b3cfc4b1d953338f6e4 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -72,6 +72,7 @@
         <item type="reference" name="media_preview_app">@drawable/ic_android_black_48dp</item>
         <item type="reference" name="media_preview_calendar">@drawable/ic_event_black_48dp</item>
         <item type="reference" name="media_preview_archive">@drawable/ic_archive_black_48dp</item>
+        <item type="reference" name="media_preview_ebook">@drawable/ic_book_black_48dp</item>
         <item type="reference" name="media_preview_unknown">@drawable/ic_help_black_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
@@ -184,6 +185,7 @@
         <item type="reference" name="media_preview_app">@drawable/ic_android_white_48dp</item>
         <item type="reference" name="media_preview_calendar">@drawable/ic_event_white_48dp</item>
         <item type="reference" name="media_preview_archive">@drawable/ic_archive_white_48dp</item>
+        <item type="reference" name="media_preview_ebook">@drawable/ic_book_white_48dp</item>
         <item type="reference" name="media_preview_unknown">@drawable/ic_help_white_48dp</item>
 
         <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>