diff --git a/src/common/config.py b/src/common/config.py
index 30eadc444..c2fb85293 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -315,6 +315,7 @@ class Config:
             'positive_184_ack': [ opt_bool, False, _('If enabled, Gajim will show an icon to show that sent message has been received by your contact')],
             'show_avatar_in_tabs': [ opt_bool, False, _('Show a mini avatar in chat window tabs and in window icon')],
             'use_keyring': [opt_bool, True, _('If True, Gajim will use the Systems Keyring to store account passwords.')],
+            'pgp_encoding': [ opt_str, '', _('Sets the encoding used by python-gnupg'), True],
     }, {})
 
     __options_per_key = {
diff --git a/src/common/gpg.py b/src/common/gpg.py
index cff37669b..4cc2b966c 100644
--- a/src/common/gpg.py
+++ b/src/common/gpg.py
@@ -22,9 +22,10 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 ##
 
-from common.gajim import HAVE_GPG, GPG_BINARY
 import os
 import logging
+from common import gajim
+from common.gajim import HAVE_GPG, GPG_BINARY
 
 if HAVE_GPG:
     import gnupg
@@ -33,7 +34,9 @@ if HAVE_GPG:
     class GnuPG(gnupg.GPG):
         def __init__(self, use_agent=False):
             gnupg.GPG.__init__(self, gpgbinary=GPG_BINARY)
-            self.encoding = 'utf-8'
+            encoding = gajim.config.get('pgp_encoding')
+            if encoding:
+                self.encoding = encoding
             self.decode_errors = 'replace'
             self.passphrase = None
             self.use_agent = use_agent