[moparisthebest] Encrypt GPG message to recipient and to our own key so that...

[moparisthebest] Encrypt GPG message to recipient and to our own key so that we can decrypt it later and use carbon. Fixes #7616

src/common/connection.py

@@ -313,9 +313,10 @@ def _prepare_message(self, jid, msg, keyID, type_='chat', subject='',
                 error = _('The contact\'s key (%s) does not match the key assigned '
                         'in Gajim.' % keyID[:8])
             else:
+                myKeyID = gajim.config.get_per('accounts', self.name, 'keyid')
                 def encrypt_thread(msg, keyID, always_trust=False):
                     # encrypt message. This function returns (msgenc, error)
-                    return self.gpg.encrypt(msg.encode('utf-8'), [keyID],
+                    return self.gpg.encrypt(msg.encode('utf-8'), [keyID, myKeyID],
                         always_trust)
                 def _on_encrypted(output):
                     msgenc, error = output
@@ -424,8 +425,6 @@ def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid,
 
         if msgenc:
             msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc)
-            if self.carbons_enabled:
-                msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS)
             msg_iq.addChild(name='no-permanent-storage',
                 namespace=nbxmpp.NS_MSG_HINTS)