diff --git a/Gemfile b/Gemfile
index 02aff697b..b198b4fbc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem "active_record_union", "~> 1.3" # Adds proper union and union_all methods to
 gem "acts-as-taggable-on", "~> 10.0" # A tagging plugin for Rails applications that allows for custom tagging along dynamic contexts
 gem "acts_as_follower", github: "forem/acts_as_follower", branch: "master" # Allow any model to follow any other model
 gem "addressable", "~> 2.8" # A replacement for the URI implementation that is part of Ruby's standard library
-gem "ahoy_email", "~> 2.1.3" # Email analytics for Rails
+gem "ahoy_email", "~> 2.2.0" # Email analytics for Rails
 gem "ahoy_matey", "~> 4.1" # Tracking analytics for Rails
 gem "ancestry", "~> 4.2" # Ancestry allows the records of a ActiveRecord model to be organized in a tree structure
 gem "blazer", "~> 2.6" # Allows admins to query data
diff --git a/Gemfile.lock b/Gemfile.lock
index a595b078a..352979fd9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,11 +80,11 @@ GEM
       activerecord (>= 6.1, < 7.2)
     addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    ahoy_email (2.1.3)
-      actionmailer (>= 5)
+    ahoy_email (2.2.0)
+      actionmailer (>= 6.1)
       addressable (>= 2.3.2)
       nokogiri
-      safely_block (>= 0.1.1)
+      safely_block (>= 0.4)
     ahoy_matey (4.2.1)
       activesupport (>= 5.2)
       device_detector
@@ -248,7 +248,6 @@ GEM
       rainbow
       rubocop
       smart_properties
-    errbase (0.2.2)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
@@ -340,8 +339,8 @@ GEM
     gibbon (3.5.0)
       faraday (>= 1.0)
       multi_json (>= 1.11.0)
-    globalid (1.1.0)
-      activesupport (>= 5.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
     google-protobuf (3.24.0)
     google-protobuf (3.24.0-arm64-darwin)
     google-protobuf (3.24.0-x86_64-darwin)
@@ -510,7 +509,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     modis (4.0.1)
       activemodel (>= 5.2)
@@ -530,14 +529,14 @@ GEM
       connection_pool (~> 2.2)
     net-http2 (0.18.4)
       http-2 (~> 0.11)
-    net-imap (0.3.7)
+    net-imap (0.4.3)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     netrc (0.11.0)
     nio4r (2.5.9)
@@ -797,8 +796,7 @@ GEM
       jquery-fileupload-rails (~> 0.4.1)
       rails (>= 3.1)
       sass-rails (>= 3.1)
-    safely_block (0.3.0)
-      errbase (>= 0.1.1)
+    safely_block (0.4.0)
     sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -977,7 +975,7 @@ DEPENDENCIES
   acts-as-taggable-on (~> 10.0)
   acts_as_follower!
   addressable (~> 2.8)
-  ahoy_email (~> 2.1.3)
+  ahoy_email (~> 2.2.0)
   ahoy_matey (~> 4.1)
   amazing_print (~> 1.4)
   ancestry (~> 4.2)
diff --git a/vendor/cache/ahoy_email-2.1.3.gem b/vendor/cache/ahoy_email-2.1.3.gem
deleted file mode 100644
index f3bb13622..000000000
Binary files a/vendor/cache/ahoy_email-2.1.3.gem and /dev/null differ
diff --git a/vendor/cache/ahoy_email-2.2.0.gem b/vendor/cache/ahoy_email-2.2.0.gem
new file mode 100644
index 000000000..84a112cd3
Binary files /dev/null and b/vendor/cache/ahoy_email-2.2.0.gem differ
diff --git a/vendor/cache/errbase-0.2.2.gem b/vendor/cache/errbase-0.2.2.gem
deleted file mode 100644
index 73fed635f..000000000
Binary files a/vendor/cache/errbase-0.2.2.gem and /dev/null differ
diff --git a/vendor/cache/globalid-1.1.0.gem b/vendor/cache/globalid-1.1.0.gem
deleted file mode 100644
index 01f9aa3b8..000000000
Binary files a/vendor/cache/globalid-1.1.0.gem and /dev/null differ
diff --git a/vendor/cache/globalid-1.2.1.gem b/vendor/cache/globalid-1.2.1.gem
new file mode 100644
index 000000000..daee53807
Binary files /dev/null and b/vendor/cache/globalid-1.2.1.gem differ
diff --git a/vendor/cache/mini_portile2-2.8.4.gem b/vendor/cache/mini_portile2-2.8.4.gem
deleted file mode 100644
index f84efe45e..000000000
Binary files a/vendor/cache/mini_portile2-2.8.4.gem and /dev/null differ
diff --git a/vendor/cache/mini_portile2-2.8.5.gem b/vendor/cache/mini_portile2-2.8.5.gem
new file mode 100644
index 000000000..15bfb05cc
Binary files /dev/null and b/vendor/cache/mini_portile2-2.8.5.gem differ
diff --git a/vendor/cache/net-imap-0.3.7.gem b/vendor/cache/net-imap-0.3.7.gem
deleted file mode 100644
index aff2aa135..000000000
Binary files a/vendor/cache/net-imap-0.3.7.gem and /dev/null differ
diff --git a/vendor/cache/net-imap-0.4.3.gem b/vendor/cache/net-imap-0.4.3.gem
new file mode 100644
index 000000000..7d0dc6a62
Binary files /dev/null and b/vendor/cache/net-imap-0.4.3.gem differ
diff --git a/vendor/cache/net-smtp-0.3.3.gem b/vendor/cache/net-smtp-0.3.3.gem
deleted file mode 100644
index 09fd408d8..000000000
Binary files a/vendor/cache/net-smtp-0.3.3.gem and /dev/null differ
diff --git a/vendor/cache/net-smtp-0.4.0.gem b/vendor/cache/net-smtp-0.4.0.gem
new file mode 100644
index 000000000..81f923605
Binary files /dev/null and b/vendor/cache/net-smtp-0.4.0.gem differ
diff --git a/vendor/cache/safely_block-0.3.0.gem b/vendor/cache/safely_block-0.3.0.gem
deleted file mode 100644
index 1d585129f..000000000
Binary files a/vendor/cache/safely_block-0.3.0.gem and /dev/null differ
diff --git a/vendor/cache/safely_block-0.4.0.gem b/vendor/cache/safely_block-0.4.0.gem
new file mode 100644
index 000000000..cd4908957
Binary files /dev/null and b/vendor/cache/safely_block-0.4.0.gem differ