1 files changed, 26 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 4e3a9daf7d..e6952a4b3b 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,29 @@
+*   Added #deliver_later in addition to #deliver, which will enqueue a job to render and
+    deliver the mail instead of delivering it right at that moment. The job is enqueued 
+    using the new Active Job framework in Rails, and will use whatever queue is configured for Rails.
+    
+    *DHH/Abdelkader Boudih/Cristian Bica*
+    
+
+*   Make ActionMailer::Previews methods class methods. Previously they were
+    instance methods and ActionMailer tries to render a message when they
+    are called.
+
+    *Cristian Bica*
+
+*   Deprecate `*_path` helpers in email views. When used they generate
+    non-working links and are not the intention of most developers. Instead
+    we recommend to use `*_url` helper.
+
+    *Richard Schneeman*
+
+*   Raise an exception when attachments are added after `mail` was called.
+    This is a safeguard to prevent invalid emails.
+
+    Fixes #16163.
+
+    *Yves Senn*
+
 *   Add `config.action_mailer.show_previews` configuration option.
 
     This config option can be used to enable the mail preview in environments