diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 9f9f34cf8e59944b97ac40044decf34c053061d6..36d6b43b00e445aa0b93389cf74a4993bc267bf6 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -552,7 +552,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private int getMostRecentlyUsedOutgoingEncryption() {
 		synchronized (this.messages) {
 			for(int i = this.messages.size() -1; i >= 0; --i) {
-				final Message m = this.messages.get(0);
+				final Message m = this.messages.get(i);
 				if (!m.isCarbon() && m.getStatus() != Message.STATUS_RECEIVED) {
 					final int e = m.getEncryption();
 					if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {
@@ -569,7 +569,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private int getMostRecentlyUsedIncomingEncryption() {
 		synchronized (this.messages) {
 			for(int i = this.messages.size() -1; i >= 0; --i) {
-				final Message m = this.messages.get(0);
+				final Message m = this.messages.get(i);
 				if (m.getStatus() == Message.STATUS_RECEIVED) {
 					final int e = m.getEncryption();
 					if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {
diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 00637257c99d7a95f55c0f6b52c44eab11f2419e..9381ba1d80aa9bd680a059035ed86ede39de9f7c 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -133,7 +133,6 @@ public class FileBackend {
 		if (path == null) {
 			return false;
 		}
-		Log.d(Config.LOGTAG,"using image as is. path: "+path);
 		BitmapFactory.Options options = new BitmapFactory.Options();
 		options.inJustDecodeBounds = true;
 		try {