diff --git a/src/parsers/message.rs b/src/parsers/message.rs
index 4374d5b..6750a44 100644
--- a/src/parsers/message.rs
+++ b/src/parsers/message.rs
@@ -343,12 +343,10 @@ impl MessageParser {
                     } else {
                         PartType::Text(text)
                     }
+                } else if !is_inline {
+                    PartType::Binary(bytes)
                 } else {
-                    if !is_inline {
-                        PartType::Binary(bytes)
-                    } else {
-                        PartType::InlineBinary(bytes)
-                    }
+                    PartType::InlineBinary(bytes)
                 }
             } else {
                 message.attachments.push(message.parts.len());
diff --git a/src/parsers/mime.rs b/src/parsers/mime.rs
index 39bb1ef..7c5dfe2 100644
--- a/src/parsers/mime.rs
+++ b/src/parsers/mime.rs
@@ -134,15 +134,15 @@ impl<'x> MessageStream<'x> {
         self.checkpoint();
 
         match (self.next(), self.peek()) {
-            (Some(&a), Some(&&b)) if a == b'\r' && b == b'\n' => {
+            (Some(b'\r'), Some(b'\n')) => {
                 self.next();
                 false
             }
-            (Some(&a), Some(&&b)) if a == b'-' && b == b'-' => {
+            (Some(b'-'), Some(b'-')) => {
                 self.next();
                 true
             }
-            (Some(&a), _) if a == b'\n' => false,
+            (Some(b'\n'), _) => false,
             (Some(&a), _) if a.is_ascii_whitespace() => {
                 self.skip_crlf();
                 false