Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

19 files changed, 536 insertions, 70 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index d902e8d4..4b11bb4a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -8,6 +8,7 @@ import android.preference.PreferenceManager;
 import java.io.File;
 
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
@@ -32,7 +33,7 @@ public class ConversationsPlusApplication extends Application {
         ConversationsPlusApplication.instance = this;
         ConversationsPlusPreferences.init(PreferenceManager.getDefaultSharedPreferences(getAppContext()));
         ImageUtil.initBitmapCache();
-        FileBackend.createNoMedia();
+        FileBackend.init();
     }
 
     /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/CursorHelper.java b/src/main/java/de/thedevstack/conversationsplus/persistance/CursorHelper.java
new file mode 100644
index 00000000..7e3fdab0
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/CursorHelper.java
@@ -0,0 +1,203 @@
+package de.thedevstack.conversationsplus.persistance;
+
+import android.database.Cursor;
+
+/**
+ * Created by steckbrief on 15.04.2016.
+ */
+public abstract class CursorHelper {
+
+    static double getDouble(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return Double.MIN_VALUE;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return Double.MIN_VALUE;
+        }
+        return getDouble(cursor, columnIndex);
+    }
+
+    static String getString(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return null;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return null;
+        }
+        return getString(cursor, columnIndex);
+    }
+
+    static float getFloat(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return Float.MIN_VALUE;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return Float.MIN_VALUE;
+        }
+        return getFloat(cursor, columnIndex);
+    }
+
+    static int getInt(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return Integer.MIN_VALUE;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return Integer.MIN_VALUE;
+        }
+        return getInt(cursor, columnIndex);
+    }
+
+    static long getLong(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return Long.MIN_VALUE;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return Long.MIN_VALUE;
+        }
+        return getLong(cursor, columnIndex);
+    }
+
+    static int getShort(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return Short.MIN_VALUE;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return Short.MIN_VALUE;
+        }
+        return getShort(cursor, columnIndex);
+    }
+
+    static byte[] getBlob(Cursor cursor, String columnName) {
+        if (null == cursor) {
+            return null;
+        }
+        int columnIndex = getColumnIndex(cursor, columnName);
+        if (columnIndex < 0) {
+            return null;
+        }
+        return getBlob(cursor, columnIndex);
+    }
+
+    /**
+     * Returns the zero-based index for the given column name, or -1 if the column doesn't exist.
+     * If you expect the column to exist use {@link Cursor#getColumnIndexOrThrow(String)} instead, which
+     * will make the error more clear.
+     *
+     * @param columnName the name of the target column.
+     * @return the zero-based column index for the given column name, or -1 if
+     * the column name does not exist.
+     * @see Cursor#getColumnIndexOrThrow(String)
+     */
+    static  int getColumnIndex(Cursor cursor, String columnName) {
+        return cursor.getColumnIndex(columnName);
+    }
+
+    /**
+     * Returns the value of the requested column as a byte array.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null or the column type is not a blob type is
+     * implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a byte array.
+     */
+    static  byte[] getBlob(Cursor cursor, int columnIndex) {
+        return cursor.getBlob(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as a String.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null or the column type is not a string type is
+     * implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a String.
+     */
+    static  String getString(Cursor cursor, int columnIndex) {
+        return cursor.getString(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as a short.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null, the column type is not an integral type, or the
+     * integer value is outside the range [<code>Short.MIN_VALUE</code>,
+     * <code>Short.MAX_VALUE</code>] is implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a short.
+     */
+    static  short getShort(Cursor cursor, int columnIndex) {
+        return cursor.getShort(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as an int.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null, the column type is not an integral type, or the
+     * integer value is outside the range [<code>Integer.MIN_VALUE</code>,
+     * <code>Integer.MAX_VALUE</code>] is implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as an int.
+     */
+    static  int getInt(Cursor cursor, int columnIndex) {
+        return cursor.getInt(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as a long.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null, the column type is not an integral type, or the
+     * integer value is outside the range [<code>Long.MIN_VALUE</code>,
+     * <code>Long.MAX_VALUE</code>] is implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a long.
+     */
+    static  long getLong(Cursor cursor, int columnIndex) {
+        return cursor.getLong(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as a float.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null, the column type is not a floating-point type, or the
+     * floating-point value is not representable as a <code>float</code> value is
+     * implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a float.
+     */
+    static  float getFloat(Cursor cursor, int columnIndex) {
+        return cursor.getFloat(columnIndex);
+    }
+
+    /**
+     * Returns the value of the requested column as a double.
+     *
+     * <p>The result and whether this method throws an exception when the
+     * column value is null, the column type is not a floating-point type, or the
+     * floating-point value is not representable as a <code>double</code> value is
+     * implementation-defined.
+     *
+     * @param columnIndex the zero-based index of the target column.
+     * @return the value of that column as a double.
+     */
+    static  double getDouble(Cursor cursor, int columnIndex) {
+        return cursor.getDouble(columnIndex);
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java b/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java
new file mode 100644
index 00000000..ba5f4a2c
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/MessageDatabaseAccess.java
@@ -0,0 +1,60 @@
+package de.thedevstack.conversationsplus.persistance;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import de.thedevstack.android.logcat.Logging;
+
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
+
+/**
+ * Created by steckbrief on 15.04.2016.
+ */
+public class MessageDatabaseAccess {
+    public static final String TABLE_NAME_ADDITIONAL_PARAMETERS = "message_parameters";
+    public static final String COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD = "httpupload";
+    public static final String COLUMN_NAME_MSG_PARAMS_MSGUUID = "message_uuid";
+    public static final String COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION = "treatasdownloadable_decision";
+
+    public static final String TABLE_ADDITIONAL_PARAMETERS_CREATE_V0 = "CREATE TABLE " + MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS + " ("
+            + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + " TEXT, "
+            + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD + " INTEGER DEFAULT 0, "
+            + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION + " TEXT DEFAULT 'NOT_DECIDED', "
+            + "FOREIGN KEY(" + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + ") REFERENCES " + Message.TABLENAME + "(" + Message.UUID + ") ON DELETE CASCADE)";
+
+    public static ContentValues getAdditionalParametersContentValues(Message message) {
+        ContentValues additionalParameters = new ContentValues();
+        additionalParameters.put(MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID, message.getUuid());
+        additionalParameters.put(MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD, message.isHttpUploaded() ? 1 : 0);
+        additionalParameters.put(MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION, message.treatAsDownloadable().name());
+
+        return additionalParameters;
+    }
+
+    public static void populateMessageParametersFromCursor(Cursor cursor, Message message) {
+        boolean isHttpUploaded = CursorHelper.getInt(cursor, COLUMN_NAME_MSG_PARAMS_HTTPUPLOAD) == 1;
+        message.setHttpUploaded(isHttpUploaded);
+        String downloadable = CursorHelper.getString(cursor, COLUMN_NAME_MSG_PARAMS_TREATASDOWNLOADABLE_DECISION);
+        Message.Decision treatAsDownloadable = Message.Decision.NOT_DECIDED;
+        try {
+            treatAsDownloadable = Message.Decision.valueOf(downloadable);
+        } catch (IllegalArgumentException e) {
+            // Should only happen if the database is corrupted, but to be on the save side catch it here
+            Logging.e("db.msg", "Unknown Decision for treatAsDownloadable found: '" + downloadable + "'");
+        }
+        message.setTreatAsDownloadable(treatAsDownloadable);
+    }
+
+    public static void populateMessageParameters(SQLiteDatabase db, Message message) {
+        Cursor paramsCursor = db.query(MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS,
+                null, MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + "=?",
+                new String[] {message.getUuid()},
+                null, null, null, null);
+        paramsCursor.moveToNext();
+        MessageDatabaseAccess.populateMessageParametersFromCursor(paramsCursor, message);
+        paramsCursor.close();
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java b/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java
new file mode 100644
index 00000000..a313c8b1
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/persistance/observers/FileDeletionObserver.java
@@ -0,0 +1,46 @@
+package de.thedevstack.conversationsplus.persistance.observers;
+
+import android.os.FileObserver;
+
+import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
+
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.entities.Transferable;
+import eu.siacs.conversations.entities.TransferablePlaceholder;
+
+/**
+ * Observer to mark messages containing files which are deleted.
+ */
+public class FileDeletionObserver extends FileObserver {
+    public FileDeletionObserver(String path) {
+        super(path, FileObserver.DELETE);
+    }
+
+    @Override
+    public void onEvent(int event, String path) {
+        if (null != path) {
+            markFileDeleted(path.split("\\.")[0]);
+        }
+    }
+
+    private void markFileDeleted(String uuid) {
+        if (null != XmppConnectionServiceAccessor.xmppConnectionService) {
+            for (Conversation conversation : XmppConnectionServiceAccessor.xmppConnectionService.getConversations()) {
+                Message message = conversation.findMessageWithFileAndUuid(uuid);
+                if (message != null) {
+                    message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
+                    final int s = message.getStatus();
+                    if (s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
+                        MessageUtil.markMessage(message, Message.STATUS_SEND_FAILED);
+                    } else {
+                        UiUpdateHelper.updateConversationUi();
+                    }
+                    return;
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index e5a478e8..4f6cffb4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -9,6 +9,7 @@ import java.util.Date;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusColors;
+import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
@@ -60,11 +61,11 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
             view.findViewById(R.id.dlgMsgDetFileTable).setVisibility(View.VISIBLE);
             if (null != message.getFileParams()) {
                 Message.FileParams params = message.getFileParams();
-                TextView tvFilesize = (TextView) view.findViewById(R.id.dlgMsgDetFileSize);
-                tvFilesize.setText(UIHelper.getHumanReadableFileSize(params.size));
+                TextViewUtil.setText(view, R.id.dlgMsgDetFileSize, UIHelper.getHumanReadableFileSize(params.size));
             }
-            TextView mimetype = (TextView) view.findViewById(R.id.dlgMsgDetFileMimeType);
-            mimetype.setText(message.getMimeType());
+            TextViewUtil.setText(view, R.id.dlgMsgDetFileMimeType, message.getMimeType());
+
+            TextViewUtil.setText(view, R.id.dlgMsgDetFileHttpUploaded, message.isHttpUploaded() ? R.string.cplus_yes : R.string.cplus_no);
         }
     }
 
@@ -108,7 +109,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      * @param message the message to display in dialog
      */
     protected void displayMessageTypeInfo(View view, Message message) {
-        TextView msgTypeTextView = (TextView) view.findViewById(R.id.dlgMsgDetMsgType);
         int msgTypeResId;
         switch (message.getType()) {
             case Message.TYPE_PRIVATE:
@@ -127,7 +127,7 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
             default:
                 msgTypeResId = R.string.dlg_msg_details_msg_type_text;
         }
-        msgTypeTextView.setText(msgTypeResId);
+        TextViewUtil.setText(view, R.id.dlgMsgDetMsgType, msgTypeResId);
     }
 
     /**
@@ -147,10 +147,8 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
 
         if (conversation.getMode() == Conversation.MODE_MULTI) {
             // Change label of sending and receiving party to MUC terminology
-            TextView senderLabel = (TextView) view.findViewById(R.id.dlgMsgDetLblSender);
-            senderLabel.setText(R.string.dlg_msg_details_sender_nick);
-            TextView receipientLabel = (TextView) view.findViewById(R.id.dlgMsgDetLblReceipient);
-            receipientLabel.setText(R.string.dlg_msg_details_receipient_nick);
+            TextViewUtil.setText(view, R.id.dlgMsgDetLblSender, R.string.dlg_msg_details_sender_nick);
+            TextViewUtil.setText(view, R.id.dlgMsgDetLblReceipient, R.string.dlg_msg_details_receipient_nick);
 
             // Get own nick for MUC
             me = conversation.getMucOptions().getActualNick();
@@ -174,7 +172,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      * @param message the message to display in dialog
      */
     protected void displayMessageSentTime(View view, Message message) {
-        TextView timeSent = (TextView) view.findViewById(R.id.dlgMsgDetTimeSent);
-        timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getTimeSent())));
+        TextViewUtil.setText(view, R.id.dlgMsgDetTimeSent, DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getTimeSent())));
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
index f8310206..afb8387d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
@@ -6,8 +6,11 @@ import java.net.URL;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
+
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.persistance.DatabaseBackend;
 import eu.siacs.conversations.persistance.FileBackend;
 
 /**
@@ -15,6 +18,17 @@ import eu.siacs.conversations.persistance.FileBackend;
  */
 public final class MessageUtil {
 
+    public static void markMessage(Message message, int status) {
+        if (status == Message.STATUS_SEND_FAILED
+                && (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
+                .getStatus() == Message.STATUS_SEND_DISPLAYED)) {
+            return;
+        }
+        message.setStatus(status);
+        DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateMessage(message);
+        UiUpdateHelper.updateConversationUi();
+    }
+
     public static boolean wasHighlightedOrPrivate(final Message message) {
         final String nick = message.getConversation().getMucOptions().getActualNick();
         final Pattern highlight = generateNickHighlightPattern(nick);
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java
new file mode 100644
index 00000000..20cd7361
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppConnectionServiceAccessor.java
@@ -0,0 +1,32 @@
+package de.thedevstack.conversationsplus.utils;
+
+import de.thedevstack.android.logcat.Logging;
+
+import eu.siacs.conversations.services.XmppConnectionService;
+
+/**
+ * Accessor utility to access XmppConnectionService without having to pass the XmppConnectionService every time.
+ */
+public final class XmppConnectionServiceAccessor {
+    public static XmppConnectionService xmppConnectionService;
+
+    /**
+     * Initializes the XmppConnectionService.
+     * This method needs to be called once in XmppConnectionService#onCreate.
+     * @param xmppConnectionService
+     */
+    public static void initXmppConnectionService(XmppConnectionService xmppConnectionService) {
+        if (null == XmppConnectionServiceAccessor.xmppConnectionService) {
+            XmppConnectionServiceAccessor.xmppConnectionService = xmppConnectionService;
+        } else {
+            Logging.e("XmppConnectionServiceAccessor", "XMPP Connection Service already instantiated.");
+        }
+    }
+
+    /**
+     * Avoid instantiation
+     */
+    private XmppConnectionServiceAccessor() {
+        // avoid instantiation
+    }
+}
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
index bb08014b..a775dad6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ui/TextViewUtil.java
@@ -1,12 +1,28 @@
 package de.thedevstack.conversationsplus.utils.ui;
 
 import android.support.annotation.StringRes;
+import android.view.View;
 import android.widget.TextView;
 
 /**
  * Created by steckbrief on 29.03.2016.
  */
 public final class TextViewUtil {
+
+    public static void setText(View parentView, int textViewId, CharSequence text) {
+        TextView tv = (TextView) parentView.findViewById(textViewId);
+        if (null != tv) {
+            tv.setText(text);
+        }
+    }
+
+    public static void setText(View parentView, int textViewId, int textResId) {
+        TextView tv = (TextView) parentView.findViewById(textViewId);
+        if (null != tv) {
+            tv.setText(textResId);
+        }
+    }
+
     public static void enable(TextView tv) {
         setColorEnabledAndTextResId(tv, null, true, null);
     }
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim/HttpUploadHint.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim/HttpUploadHint.java
new file mode 100644
index 00000000..7868a2f5
--- /dev/null
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/httpuploadim/HttpUploadHint.java
@@ -0,0 +1,15 @@
+package de.thedevstack.conversationsplus.xmpp.httpuploadim;
+
+import eu.siacs.conversations.xml.Element;
+
+/**
+ * Created by steckbrief on 17.04.2016.
+ */
+public class HttpUploadHint extends Element {
+    public static final String NAMESPACE = "urn:xmpp:hints";
+    public static final String ELEMENT_NAME = "httpupload";
+
+    public HttpUploadHint() {
+        super(ELEMENT_NAME, NAMESPACE);
+    }
+}
diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 56ca26da..a5937e0a 100644
--- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
@@ -62,7 +62,7 @@ public class PgpEngine {
 								final HttpConnectionManager manager = mXmppConnectionService.getHttpConnectionManager();
 								if (message.trusted()
 										&& message.treatAsDownloadable() != Message.Decision.NEVER
-                                        && ConversationsPlusPreferences.autoDownloadFileLink()
+                                        && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())
 										&& ConversationsPlusPreferences.autoAcceptFileSize() > 0) {
 									manager.createNewDownloadConnection(message);
 								}
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 5046797f..7878cecd 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -141,6 +141,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public Message findMessageWithFileAndUuid(final String uuid) {
+        // TODO Implement this method to find a message by a real filename - not uuid
 		synchronized (this.messages) {
 			for (final Message message : this.messages) {
 				if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE)
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 7a5be8f8..6faebc65 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -83,6 +83,8 @@ public class Message extends AbstractEntity {
 	private String axolotlFingerprint = null;
 	private Decision mTreatAsDownloadAble = Decision.NOT_DECIDED;
 
+    private boolean httpUploaded;
+
 	private Message() {
 
 	}
@@ -535,6 +537,10 @@ public class Message extends AbstractEntity {
 		mTreatAsDownloadAble = Decision.NEVER;
 	}
 
+    public void setTreatAsDownloadable(Decision downloadable) {
+        this.mTreatAsDownloadAble = downloadable;
+    }
+
 	public Decision treatAsDownloadable() {
 		// only test this ones, body will not change
 		if (mTreatAsDownloadAble != Decision.NOT_DECIDED) {
@@ -554,9 +560,6 @@ public class Message extends AbstractEntity {
 			if (!url.getProtocol().equalsIgnoreCase("http") && !url.getProtocol().equalsIgnoreCase("https")) {
 				mTreatAsDownloadAble = Decision.NEVER;
 				return mTreatAsDownloadAble;
-			} else if (oob) {
-				mTreatAsDownloadAble = Decision.MUST;
-				return mTreatAsDownloadAble;
 			}
 			String extension = extractRelevantExtension(url);
 			if (extension == null) {
@@ -754,6 +757,14 @@ public class Message extends AbstractEntity {
 		return inUnencryptedSession || getCleanedEncryption(this.getEncryption()) == pastEncryption;
 	}
 
+	public boolean isHttpUploaded() {
+		return httpUploaded;
+	}
+
+	public void setHttpUploaded(boolean httpUploaded) {
+		this.httpUploaded = httpUploaded;
+	}
+
 	private static int getCleanedEncryption(int encryption) {
 		if (encryption == ENCRYPTION_DECRYPTED || encryption == ENCRYPTION_DECRYPTION_FAILED) {
 			return ENCRYPTION_PGP;
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 2d7b66b5..c003da43 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -10,6 +10,8 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
+
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -112,6 +114,9 @@ public class MessageGenerator extends AbstractGenerator {
 		if (message.hasFileOnRemoteHost()) {
 			Message.FileParams fileParams = message.getFileParams();
 			content = fileParams.url.toString();
+            if (message.isHttpUploaded()) {
+                packet.addChild(new HttpUploadHint());
+            }
 			packet.addChild("x","jabber:x:oob").addChild("url").setContent(content);
             if (fileParams.width > 0 && fileParams.height > 0) {
                 addXhtmlImImage(packet,fileParams);
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index 2cd59296..3effb813 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -97,6 +97,8 @@ public class HttpUploadConnection implements Transferable {
 
 	public void init(Message message, boolean delay) {
 		this.message = message;
+        this.message.setHttpUploaded(true);
+        this.message.setNoDownloadable();
 		this.account = message.getConversation().getAccount();
 		this.file = FileBackend.getFile(message, false);
 		this.mime = this.file.getMimeType();
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 602cf392..eb1711df 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.parser;
 import android.util.Log;
 import android.util.Pair;
 
+import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
 import de.tzur.conversations.Settings;
 
 import net.java.otr4j.session.Session;
@@ -391,6 +392,10 @@ public class MessageParser extends AbstractParser implements
 			if (serverMsgId == null) {
 				serverMsgId = extractStanzaId(packet, isTypeGroupChat ? conversation.getJid().toBareJid() : account.getServer());
 			}
+            message.setHttpUploaded(packet.hasChild(HttpUploadHint.ELEMENT_NAME, HttpUploadHint.NAMESPACE));
+            if (message.isHttpUploaded()) {
+                message.setTreatAsDownloadable(Message.Decision.MUST);
+            }
 
 			message.setCounterpart(counterpart);
 			message.setRemoteMsgId(remoteMsgId);
@@ -466,7 +471,7 @@ public class MessageParser extends AbstractParser implements
 			if (message.trusted()
                     && message.treatAsDownloadable() != Message.Decision.NEVER
                     && ConversationsPlusPreferences.autoAcceptFileSize() > 0
-                    && ConversationsPlusPreferences.autoDownloadFileLink()) {
+                    && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())) {
 				this.mXmppConnectionService.getHttpConnectionManager().createNewDownloadConnection(message);
 			} else {
 				if (query == null) {
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index e8acd400..bd20e694 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -34,6 +34,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import org.json.JSONException;
 
 import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.persistance.MessageDatabaseAccess;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlServiceImpl;
 import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore;
@@ -53,6 +55,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
 	private static final String DATABASE_NAME = "history";
 	private static final int DATABASE_VERSION = 25;
+    private static final int C_TO_CPLUS_VERSION_OFFSET = 1000;
+    private static final int CPLUS_DATABASE_VERSION = 1;
+    private static final int CPLUS_DATABASE_VERSION_MULTIPLIER = 100;
+    private static final int PHYSICAL_DATABASE_VERSION = DATABASE_VERSION + C_TO_CPLUS_VERSION_OFFSET + (CPLUS_DATABASE_VERSION * CPLUS_DATABASE_VERSION_MULTIPLIER);
 
 	private static String CREATE_CONTATCS_STATEMENT = "create table "
 			+ Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
@@ -129,8 +135,17 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			+ ") ON CONFLICT IGNORE"
 			+ ");";
 
+    private static int calculateCDatabaseVersion(int physicalDatabaseVersion) {
+        return physicalDatabaseVersion % CPLUS_DATABASE_VERSION_MULTIPLIER;
+    }
+
+    private static int calculateCPLusDatabaseVersion(int physicalDatabaseVersion) {
+        int cPlusDatabaseVersion = (physicalDatabaseVersion - C_TO_CPLUS_VERSION_OFFSET) / CPLUS_DATABASE_VERSION_MULTIPLIER;
+        return cPlusDatabaseVersion < 0 ? 0 : cPlusDatabaseVersion;
+    }
+
 	private DatabaseBackend(Context context) {
-		super(context, DATABASE_NAME, null, DATABASE_VERSION);
+		super(context, DATABASE_NAME, null, PHYSICAL_DATABASE_VERSION);
 	}
 
 	@Override
@@ -176,10 +191,34 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 		db.execSQL(CREATE_PREKEYS_STATEMENT);
 		db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT);
 		db.execSQL(CREATE_IDENTITIES_STATEMENT);
+
+        // Create Conversations+ related tables
+        db.execSQL(MessageDatabaseAccess.TABLE_ADDITIONAL_PARAMETERS_CREATE_V0);
 	}
 
+    protected void onUpgradeCPlusDatabase(SQLiteDatabase db, int oldVersion, int newVersion) {
+        Logging.d("db.upgrade.cplus", "Updating Conversations+ database from version '" + oldVersion + "' to '" + newVersion + "'");
+        if (oldVersion < newVersion) {
+            if (oldVersion == 0 && newVersion == 1) {
+                Logging.d("db.upgrade.cplus", "Creating additional parameters table for messages.");
+                db.execSQL(MessageDatabaseAccess.TABLE_ADDITIONAL_PARAMETERS_CREATE_V0);
+                db.execSQL("INSERT INTO " + MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS + "(" + MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + ") "
+                        + " SELECT " + Message.UUID + " FROM " + Message.TABLENAME);
+            }
+        }
+    }
+
 	@Override
 	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        onUpgradeConversationsDatabase(db, calculateCDatabaseVersion(oldVersion), calculateCDatabaseVersion(newVersion));
+        onUpgradeCPlusDatabase(db, calculateCPLusDatabaseVersion(oldVersion), calculateCPLusDatabaseVersion(newVersion));
+    }
+
+    protected void onUpgradeConversationsDatabase(SQLiteDatabase db, int oldVersion, int newVersion) {
+        Logging.d("db.upgrade.conversations", "Updating Conversations database from version '" + oldVersion + "' to '" + newVersion + "'");
+        if (oldVersion == newVersion) {
+            return;
+        }
 		if (oldVersion < 2 && newVersion >= 2) {
 			db.execSQL("update " + Account.TABLENAME + " set "
 					+ Account.OPTIONS + " = " + Account.OPTIONS + " | 8");
@@ -396,8 +435,14 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 	}
 
 	public void createMessage(Message message) {
+        Logging.d("db.msg.insert", "Inserting new message with uuid '" + message.getUuid() + "', isRead: " + message.isRead());
+
 		SQLiteDatabase db = this.getWritableDatabase();
+        db.beginTransaction();
 		db.insert(Message.TABLENAME, null, message.getContentValues());
+        db.insert(MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS, null, MessageDatabaseAccess.getAdditionalParametersContentValues(message));
+        db.setTransactionSuccessful();
+        db.endTransaction();
 	}
 
 	public void createAccount(Account account) {
@@ -471,6 +516,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			cursor.moveToLast();
 			do {
 				Message message = Message.fromCursor(cursor);
+                MessageDatabaseAccess.populateMessageParameters(db, message);
 				message.setConversation(conversation);
 				list.add(message);
 			} while (cursor.moveToPrevious());
@@ -502,6 +548,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 					@Override
 					public Message next() {
 						Message message = Message.fromCursor(cursor);
+                        MessageDatabaseAccess.populateMessageParameters(db, message);
 						cursor.moveToNext();
 						return message;
 					}
@@ -598,17 +645,28 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 	}
 
 	public void updateMessage(Message message) {
+        Logging.d("db.msg.update", "Updating message with uuid '" + message.getUuid() + "', isRead: " + message.isRead());
 		SQLiteDatabase db = this.getWritableDatabase();
 		String[] args = {message.getUuid()};
+        db.beginTransaction();
 		db.update(Message.TABLENAME, message.getContentValues(), Message.UUID
 				+ "=?", args);
+        db.update(MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS, MessageDatabaseAccess.getAdditionalParametersContentValues(message), MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + "=?", args);
+        db.setTransactionSuccessful();
+        db.endTransaction();
 	}
 
 	public void updateMessage(Message message, String uuid) {
+        Logging.d("db.msg.update", "Updating message with uuid '" + uuid + "', isRead: " + message.isRead());
+
 		SQLiteDatabase db = this.getWritableDatabase();
 		String[] args = {uuid};
+        db.beginTransaction();
 		db.update(Message.TABLENAME, message.getContentValues(), Message.UUID
 				+ "=?", args);
+        db.update(MessageDatabaseAccess.TABLE_NAME_ADDITIONAL_PARAMETERS, MessageDatabaseAccess.getAdditionalParametersContentValues(message), MessageDatabaseAccess.COLUMN_NAME_MSG_PARAMS_MSGUUID + "=?", args);
+        db.setTransactionSuccessful();
+        db.endTransaction();
 	}
 
 	public void readRoster(Roster roster) {
@@ -642,6 +700,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 	}
 
 	public void deleteMessagesInConversation(Conversation conversation) {
+        Logging.d("db.msg.delete", "Deleting messages in conversation   with uuid '" + conversation.getUuid());
+
 		SQLiteDatabase db = this.getWritableDatabase();
 		String[] args = {conversation.getUuid()};
 		db.delete(Message.TABLENAME, Message.CONVERSATION + "=?", args);
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index c0d09c07..8abbb0cb 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -21,6 +21,7 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
+import de.thedevstack.conversationsplus.persistance.observers.FileDeletionObserver;
 import de.thedevstack.conversationsplus.utils.StreamUtil;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -30,8 +31,34 @@ import eu.siacs.conversations.services.XmppConnectionService;
 
 public class FileBackend {
 	private static final SimpleDateFormat imageDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US);
+    private static FileBackend INSTANCE;
 
-	public static void createNoMedia() {
+    private FileDeletionObserver privateFilesDirectoryObserver;
+    private FileDeletionObserver privateFilesImageDirectoryObserver;
+    private FileDeletionObserver conversationsFilesDirectoryObserver;
+    private FileDeletionObserver conversationsImagesDirectoryObserver;
+
+    public static void init() {
+        if (null == INSTANCE) {
+            INSTANCE = new FileBackend();
+        }
+        INSTANCE.initFileObservers();
+        INSTANCE.createNoMedia();
+    }
+
+    private void initFileObservers() {
+        this.privateFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getPrivateFileDirectoryPath());
+        this.privateFilesImageDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsFileDirectory());
+        this.conversationsFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsImageDirectory());
+        this.conversationsImagesDirectoryObserver = new FileDeletionObserver(FileBackend.getPrivateImageDirectoryPath());
+
+        this.privateFilesDirectoryObserver.startWatching();
+        this.privateFilesImageDirectoryObserver.startWatching();
+        this.conversationsFilesDirectoryObserver.startWatching();
+        this.conversationsImagesDirectoryObserver.startWatching();
+    }
+
+	private void createNoMedia() {
 		final File nomedia = new File(getConversationsFileDirectory()+".nomedia");
 		if (!nomedia.exists()) {
 			try {
@@ -42,6 +69,19 @@ public class FileBackend {
 		}
 	}
 
+    public static void onFileTransferFolderChanged() {
+        INSTANCE.conversationsFilesDirectoryObserver.stopWatching();
+        INSTANCE.conversationsFilesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsFileDirectory());
+        INSTANCE.conversationsFilesDirectoryObserver.startWatching();
+        INSTANCE.createNoMedia();
+    }
+
+    public static void onImageTransferFolderChanged() {
+        INSTANCE.conversationsImagesDirectoryObserver.stopWatching();
+        INSTANCE.conversationsImagesDirectoryObserver = new FileDeletionObserver(FileBackend.getConversationsImageDirectory());
+        INSTANCE.conversationsImagesDirectoryObserver.startWatching();
+    }
+
 	public static void updateMediaScanner(File file, XmppConnectionService xmppConnectionService) {
 		if (file.getAbsolutePath().startsWith(getConversationsImageDirectory())) {
 			Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 4180ce55..62c50395 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -7,7 +7,6 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.media.AudioManager;
@@ -17,13 +16,11 @@ import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.FileObserver;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.security.KeyChain;
 import android.util.DisplayMetrics;
@@ -65,6 +62,7 @@ import de.thedevstack.conversationsplus.exceptions.FileCopyException;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppConnectionServiceAccessor;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 import de.tzur.conversations.Settings;
 import eu.siacs.conversations.Config;
@@ -204,16 +202,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private MessageArchiveService mMessageArchiveService = new MessageArchiveService(this);
 	private PushManagementService mPushManagementService = new PushManagementService(this);
 	private OnConversationUpdate mOnConversationUpdate = null;
-	private final FileObserver fileObserver = new FileObserver(
-			FileBackend.getConversationsImageDirectory()) {
-
-		@Override
-		public void onEvent(int event, String path) {
-			if (event == FileObserver.DELETE) {
-				markFileDeleted(path.split("\\.")[0]);
-			}
-		}
-	};
 	private final OnJinglePacketReceived jingleListener = new OnJinglePacketReceived() {
 
 		@Override
@@ -665,7 +653,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		restoreFromDatabase();
 
 		getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, contactObserver);
-		this.fileObserver.startWatching();
 
 		if (Config.supportOpenPgp()) {
 			this.pgpServiceConnection = new OpenPgpServiceConnection(getApplicationContext(), "org.sufficientlysecure.keychain", new OpenPgpServiceConnection.OnBound() {
@@ -690,6 +677,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		toggleForegroundService();
 		updateUnreadCountBadge();
         UiUpdateHelper.initXmppConnectionService(this);
+        XmppConnectionServiceAccessor.initXmppConnectionService(this);
 		toggleScreenEventReceiver();
 	}
 
@@ -1177,24 +1165,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		});
 	}
 
-	private void markFileDeleted(String uuid) {
-		for (Conversation conversation : getConversations()) {
-			Message message = conversation.findMessageWithFileAndUuid(uuid);
-			if (message != null) {
-				if (!FileBackend.isFileAvailable(message)) {
-					message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
-					final int s = message.getStatus();
-					if (s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
-						markMessage(message, Message.STATUS_SEND_FAILED);
-					} else {
-						updateConversationUi();
-					}
-				}
-				return;
-			}
-		}
-	}
-
 	public void populateWithOrderedConversations(final List<Conversation> list) {
 		populateWithOrderedConversations(list, true);
 	}
@@ -2203,11 +2173,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		updateConversationUi();
 	}
 
-	public void updateMessage(Message message, String uuid) {
-		databaseBackend.updateMessage(message, uuid);
-		updateConversationUi();
-	}
-
 	protected void syncDirtyContacts(Account account) {
 		for (Contact contact : account.getRoster().getContacts()) {
 			if (contact.getOption(Contact.Options.DIRTY_PUSH)) {
@@ -2417,14 +2382,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void markMessage(Message message, int status) {
-		if (status == Message.STATUS_SEND_FAILED
-				&& (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
-				.getStatus() == Message.STATUS_SEND_DISPLAYED)) {
-			return;
-		}
-		message.setStatus(status);
-		databaseBackend.updateMessage(message);
-		updateConversationUi();
+        MessageUtil.markMessage(message, status);
 	}
 
 	public int unreadCount() {
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 5b1978c4..30f71229 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -9,13 +9,10 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
-import android.util.Log;
 import android.widget.Toast;
 
 import java.security.KeyStoreException;
@@ -27,12 +24,13 @@ import java.util.Locale;
 
 import de.duenndns.ssl.MemorizingTrustManager;
 import de.tzur.conversations.Settings;
-import eu.siacs.conversations.Config;
+
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.services.ExportLogsService;
 import eu.siacs.conversations.xmpp.XmppConnection;
+
 import github.ankushsachdeva.emojicon.EmojiconHandler;
 
 public class SettingsActivity extends XmppActivity implements
@@ -187,7 +185,9 @@ public class SettingsActivity extends XmppActivity implements
 		} else if ("parse_emoticons".equals(name)) {
             EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
         } else if ("file_transfer_folder".equals(name)) {
-			FileBackend.createNoMedia();
+			FileBackend.onFileTransferFolderChanged();
+		} else if ("img_transfer_folder".equals(name)) {
+            FileBackend.onImageTransferFolderChanged();
 		}
 
 	}