diff --git a/pgp/pgpplugin.py b/pgp/pgpplugin.py
index ed87bf8d536cccc154f7196b9b54d2c11814967a..27ee33838f4f5b0fae1c437781544cf9dfd3220a 100644
--- a/pgp/pgpplugin.py
+++ b/pgp/pgpplugin.py
@@ -229,6 +229,7 @@ class OldPGPPlugin(GajimPlugin):
                     None, conn=conn, jid=obj.jid, message=obj.message,
                     error=error, time_=time.time(), session=obj.session))
             return
+
         self.cleanup_stanza(obj)
 
         if msgenc:
@@ -240,10 +241,11 @@ class OldPGPPlugin(GajimPlugin):
                                           'namespace': nbxmpp.NS_ENCRYPTED})
             obj.msg_iq.addChild(node=eme_node)
 
-        # Set xhtml to None so it doesnt get logged
-        obj.xhtml = None
-        obj.encrypted = self.encryption_name
-        print_msg_to_log(obj.msg_iq)
+            # Set xhtml to None so it doesnt get logged
+            obj.xhtml = None
+            obj.encrypted = self.encryption_name
+            print_msg_to_log(obj.msg_iq)
+
         callback(obj)
 
     def encrypt_file(self, file, account, callback):