3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index c270f5b43..154f98af9 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -541,13 +541,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         }
     }
 
-    public boolean hasBookmarkFor(final Jid jid) {
-        synchronized (this.bookmarks) {
-            return this.bookmarks.containsKey(jid.asBareJid());
-        }
-    }
-
-    Bookmark getBookmark(final Jid jid) {
+    public Bookmark getBookmark(final Jid jid) {
         synchronized (this.bookmarks) {
             return this.bookmarks.get(jid.asBareJid());
         }
diff --git a/src/main/java/de/pixart/messenger/entities/DownloadableFile.java b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java
index 936b8dd61..1209d16eb 100644
--- a/src/main/java/de/pixart/messenger/entities/DownloadableFile.java
+++ b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java
@@ -1,7 +1,10 @@
 package de.pixart.messenger.entities;
 
+import android.util.Log;
+
 import java.io.File;
 
+import de.pixart.messenger.Config;
 import de.pixart.messenger.utils.MimeUtils;
 
 public class DownloadableFile extends File {
@@ -67,6 +70,7 @@ public class DownloadableFile extends File {
             this.iv = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0xf};
             System.arraycopy(keyIvCombo, 0, aeskey, 0, 32);
         }
+        Log.d(Config.LOGTAG, "using " + this.iv.length + "-byte IV for file transmission");
     }
 
     public void setKey(byte[] key) {
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index b2297cd08..21ab33975 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -637,6 +637,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                         !this.isGeoUri() &&
                         !message.isWebUri() &&
                         !this.isWebUri() &&
+                        !message.isOOb() &&
+                        !this.isOOb() &&
                         !message.treatAsDownloadable() &&
                         !this.treatAsDownloadable() &&
                         !message.getBody().startsWith(ME_COMMAND) &&