diff --git a/mms2mail b/mms2mail
index 6ea96ff..7dd5b6a 100755
--- a/mms2mail
+++ b/mms2mail
@@ -1,4 +1,16 @@
 #!/usr/bin/python3
+#upstream bug dirty fix https://github.com/marrow/mailer/issues/87#issuecomment-689586587
+import sys
+if sys.version_info[0] == 3 and sys.version_info[1] > 7:
+    sys.modules["cgi.parse_qsl"] = None
+#upstream bug dirty fix https://github.com/marrow/mailer/issues/87#issuecomment-713319548
+import base64
+if sys.version_info[0] == 3 and sys.version_info[1] > 8:
+    def encodestring(value):
+        return base64.b64encode(value)
+    base64.encodestring = encodestring
+#end bugfix
+
 import argparse
 import configparser
 import time