From 8bc8dbc134d4f830fcc932c5d5c4194127b2d693 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Tue, 17 May 2022 16:11:39 +0100
Subject: [PATCH] Revert "DEV: Drop our `mail` gem fork (#16622)" (#16853)

This reverts commit 0d30c19b7e1034c39e9eba01d8ac11570815e15f.

Pending resolution of https://github.com/mikel/mail/issues/1489
---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index ebacad90a46..e35e37c8104 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,7 @@ gem 'actionview_precompiler', require: false
 
 gem 'seed-fu'
 
-gem 'mail', '2.8.0.rc1', require: false
+gem 'mail', git: 'https://github.com/discourse/mail.git', require: false
 gem 'mini_mime'
 gem 'mini_suffix'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8b9ede6244b..f5ad16e38a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: https://github.com/discourse/mail.git
+  revision: 5b700fc95ee66378e0cf2559abc73c8bc3062a4b
+  specs:
+    mail (2.8.0.edge)
+      mini_mime (>= 0.1.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -221,11 +228,6 @@ GEM
       nokogiri (>= 1.5.9)
     lru_redux (1.1.0)
     lz4-ruby (0.3.3)
-    mail (2.8.0.rc1)
-      mini_mime (>= 0.1.1)
-      net-imap
-      net-pop
-      net-smtp
     maxminddb (0.1.22)
     memory_profiler (1.0.0)
     message_bus (4.2.0)
@@ -563,7 +565,7 @@ DEPENDENCIES
   loofah
   lru_redux
   lz4-ruby
-  mail (= 2.8.0.rc1)
+  mail!
   maxminddb
   memory_profiler
   message_bus