diff --git a/imbox/imap.py b/imbox/imap.py
index 627b8b5..ec05a10 100644
--- a/imbox/imap.py
+++ b/imbox/imap.py
@@ -11,10 +11,10 @@ class ImapTransport(object):
             self.transport = IMAP4_SSL
             if not self.port:
                 self.port = 993
-            else:
-                self.transport = IMAP4
-                if not self.port:
-                    self.port = 143
+        else:
+            self.transport = IMAP4
+            if not self.port:
+                self.port = 143
 
         self.server = self.transport(self.hostname, self.port)
 
diff --git a/imbox/parser.py b/imbox/parser.py
index 639af29..99ff752 100644
--- a/imbox/parser.py
+++ b/imbox/parser.py
@@ -131,9 +131,9 @@ def parse_email(raw_email):
                 if attachment:
                     attachments.append(attachment)
 
-                elif maintype == 'text':
-                    payload = email_message.get_payload(decode=True)
-                    body['plain'].append(payload)
+    elif maintype == 'text':
+        payload = email_message.get_payload(decode=True)
+        body['plain'].append(payload)
 
     parsed_email['attachments'] = attachments