diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index df510efe8..db48c8b3d 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -134,10 +134,12 @@ public class FileBackend {
 
 	public static boolean allFilesUnderSize(Context context, List<Uri> uris, long max) {
 		if (max <= 0) {
+			Log.d(Config.LOGTAG,"server did not report max file size for http upload");
 			return true; //exception to be compatible with HTTP Upload < v0.2
 		}
 		for(Uri uri : uris) {
 			if (FileBackend.getFileSize(context, uri) > max) {
+				Log.d(Config.LOGTAG,"not all files are under "+max+" bytes. suggesting falling back to jingle");
 				return false;
 			}
 		}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 687f07da0..26139f8e0 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1555,7 +1555,12 @@ public class XmppConnection implements Runnable {
 				if (items.size() > 0) {
 					try {
 						long maxsize = Long.parseLong(items.get(0).getValue().getExtendedDiscoInformation(Xmlns.HTTP_UPLOAD, "max-file-size"));
-						return filesize <= maxsize;
+						if(filesize <= maxsize) {
+							return true;
+						} else {
+							Log.d(Config.LOGTAG,account.getJid().toBareJid()+": http upload is not available for files with size "+filesize+" (max is "+maxsize+")");
+							return false;
+						}
 					} catch (Exception e) {
 						return true;
 					}