diff --git a/gpg-mailgate.py b/gpg-mailgate.py
index 00ab3cf..89266ce 100755
--- a/gpg-mailgate.py
+++ b/gpg-mailgate.py
@@ -50,6 +50,8 @@ def encrypt_payload( payload, gpg_to_cmdline ):
 		return payload
 	gpg = GnuPG.GPGEncryptor( cfg['gpg']['keyhome'], gpg_to_cmdline, payload.get_content_charset() )
 	gpg.update( raw_payload )
+	if "-----BEGIN PGP MESSAGE-----" in raw_payload and "-----END PGP MESSAGE-----" in raw_payload:
+		return payload
 	payload.set_payload( gpg.encrypt() )
 	if payload['Content-Disposition']:
 		payload.replace_header( 'Content-Disposition', re.sub(r'filename="([^"]+)"', r'filename="\1.pgp"', payload['Content-Disposition']) )