diff --git a/Gemfile b/Gemfile
index 5378557430f..2f4e5972915 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,8 +24,7 @@ else
   gem 'seed-fu'
 end
 
-gem 'mail'
-gem 'mime-types', require: 'mime/types/columnar'
+gem 'mail', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c2a0f404b9..0d7600cb2ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,16 +163,13 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
     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)
@@ -445,7 +442,6 @@ DEPENDENCIES
   mail
   memory_profiler
   message_bus
-  mime-types
   mini_mime
   mini_racer
   mini_suffix