1 files changed, 37 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 9e9d07b386..1867a392eb 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,39 @@
-* No changes.
+*   Add mailer previews feature based on 37 Signals mail_view gem
+
+    *Andrew White*
+
+*   Calling `mail()` without arguments serves as getter for the current mail
+    message and keeps previously set headers.
+
+    Fixes #13090.
+
+    Example:
+
+        class MailerWithCallback < ActionMailer::Base
+          after_action :a_callback
+
+          def welcome
+            mail subject: "subject", to: ["joe@example.com"]
+          end
+
+          def a_callback
+            mail # => returns the current mail message
+          end
+        end
+
+    *Yves Senn*
+
+*   Instrument the generation of Action Mailer messages. The time it takes to
+    generate a message is written to the log.
+
+    *Daniel Schierbeck*
+
+*   Invoke mailer defaults as procs only if they are procs, do not convert with
+    `to_proc`. That an object is convertible to a proc does not mean it's meant
+    to be always used as a proc.
+
+    Fixes #11533.
+
+    *Alex Tsukernik*
 
 Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.