diff --git a/helpdesk/lib.py b/helpdesk/lib.py
index afff47b5..637b3d1e 100644
--- a/helpdesk/lib.py
+++ b/helpdesk/lib.py
@@ -123,18 +123,8 @@ def send_templated_mail(template_name,
 
     if files:
         for filename, filefield in files:
-            mime = mimetypes.guess_type(filename)
-            if mime[0] is not None and mime[0] == "text/plain":
-                with open(filefield.path, 'r') as attachedfile:
-                    content = attachedfile.read()
-                    msg.attach(filename, content)
-            else:
-                if six.PY3:
-                    msg.attach_file(filefield.path)
-                else:
-                    with open(filefield.path, 'rb') as attachedfile:
-                        content = attachedfile.read()
-                        msg.attach(filename, content)
+            content = filefield.read()
+            msg.attach(filename, content)
 
     logger.debug('Sending email to: {!r}'.format(recipients))