diff --git a/mms2mail b/mms2mail
index 24ec2e9..dc5e1bd 100755
--- a/mms2mail
+++ b/mms2mail
@@ -1,28 +1,5 @@
 #!/usr/bin/python3
 """An mms to mail converter for mmsd."""
-# 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):
-        """
-        Encode string in base64.
-
-        :param value: the string to encode.
-        :type value: str
-
-        :rtype str
-        :return: the base64 encoded string
-        """
-        return base64.b64encode(value)
-    base64.encodestring = encodestring
-# end bugfix
-
 import argparse
 import configparser
 import getpass