diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index b221ec0cc..7c5a0f63a 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -302,7 +302,7 @@ public class JingleConnection {
 				public void onFileTransmitted(JingleFile file) {
 					if (responder.equals(account.getFullJid())) {
 						sendSuccess();
-						mXmppConnectionService.markMessage(message, Message.STATUS_SEND);
+						mXmppConnectionService.markMessage(message, Message.STATUS_RECIEVED);
 					}
 					Log.d("xmppService","sucessfully transmitted file. sha1:"+file.getSha1Sum());
 				}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 44af51a34..a45ebb767 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -120,11 +120,11 @@ public class JingleConnectionManager {
 	}
 	
 	public long getAutoAcceptFileSize() {
-		String config = this.xmppConnectionService.getPreferences().getString("auto_accept_file_size", "0");
+		String config = this.xmppConnectionService.getPreferences().getString("auto_accept_file_size", "524288");
 		try {
 			return Long.parseLong(config);
 		} catch (NumberFormatException e) {
-			return 0;
+			return 524288;
 		}
 	}
 }