diff --git a/.gitattributes b/.gitattributes
index 546b134a0ce..ae7015b472a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,14 +1,11 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
-# Treat email fixtures as binary files so CRLF are not converted to LF.
-*.eml binary
-
-# Explicitly declare text files we want to always be normalized and converted
+# Explicitly declare text files we want to always be normalized and converted 
 # to native line endings on checkout.
 *.yml text
 
-# Custom for Visual Studio, very unlikely, but lets keep it
+# Custom for Visual Studio, very unlikely, but lets keep it 
 *.cs     diff=csharp
 *.sln    merge=union
 *.csproj merge=union
diff --git a/Gemfile b/Gemfile
index 3db4f98f0a8..cf250465649 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,6 +26,7 @@ else
 end
 
 gem 'mail'
+gem 'mime-types', require: 'mime/types/columnar'
 gem 'mini_mime'
 gem 'mini_suffix'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 79ba711e6b4..09d9ff3bb30 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,13 +162,16 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
+    mail (2.6.6)
+      mime-types (>= 1.16, < 4)
     memory_profiler (0.9.10)
     message_bus (2.1.2)
       rack (>= 1.1.3)
     metaclass (0.0.4)
     method_source (0.8.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mini_mime (0.1.3)
     mini_portile2 (2.3.0)
     mini_racer (0.1.15)
@@ -439,6 +442,7 @@ DEPENDENCIES
   mail
   memory_profiler
   message_bus
+  mime-types
   mini_mime
   mini_racer
   mini_suffix
diff --git a/spec/fixtures/emails/encoded_display_name.eml b/spec/fixtures/emails/encoded_display_name.eml
index 132e4404011..1b5d6bb3a10 100644
Binary files a/spec/fixtures/emails/encoded_display_name.eml and b/spec/fixtures/emails/encoded_display_name.eml differ
diff --git a/spec/fixtures/emails/forwarded_email_3.eml b/spec/fixtures/emails/forwarded_email_3.eml
index 549dd44a68b..1f37822b0a7 100644
Binary files a/spec/fixtures/emails/forwarded_email_3.eml and b/spec/fixtures/emails/forwarded_email_3.eml differ
diff --git a/spec/fixtures/emails/inline_image.eml b/spec/fixtures/emails/inline_image.eml
index b169f8167a0..af3283702a9 100644
Binary files a/spec/fixtures/emails/inline_image.eml and b/spec/fixtures/emails/inline_image.eml differ
diff --git a/spec/fixtures/emails/reply_with_8bit_encoding.eml b/spec/fixtures/emails/reply_with_8bit_encoding.eml
index 2d025dd929b..ed99f6752a8 100644
Binary files a/spec/fixtures/emails/reply_with_8bit_encoding.eml and b/spec/fixtures/emails/reply_with_8bit_encoding.eml differ