diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 45411ef62..e44d85056 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -119,6 +119,8 @@ public class JingleConnection implements Transferable {
                     }
                     Log.d(Config.LOGTAG, "successfully transmitted file:" + file.getAbsolutePath() + " (" + CryptoHelper.bytesToHex(file.getSha1Sum()) + ")");
                     return;
+                } else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+                    account.getPgpDecryptionService().decrypt(message, true);
                 }
             } else {
                 if (ftVersion == Content.Version.FT_5) { //older Conversations will break when receiving a session-info
@@ -423,7 +425,7 @@ public class JingleConnection implements Transferable {
                 } else if (VALID_CRYPTO_EXTENSIONS.contains(extension.main)) {
                     if (VALID_IMAGE_EXTENSIONS.contains(extension.secondary)) {
                         message.setType(Message.TYPE_IMAGE);
-                        message.setRelativeFilePath(message.getUuid() + "." + extension.main);
+                        message.setRelativeFilePath(message.getUuid() + "." + extension.secondary);
                     } else {
                         message.setType(Message.TYPE_FILE);
                         message.setRelativeFilePath(message.getUuid() + (extension.secondary != null ? ("." + extension.secondary) : ""));