diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index e29890f2d8872..e5443033e9998 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -27,4 +27,7 @@
 
 * Asynchronously send messages via the Rails Queue *Brian Cardarella*
 
+* Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
+  settings, headers, attachments, delivery settings or change delivery using `before_filter`, `after_filter` etc. *Justin S. Leitgeb*
+
 Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/guides/source/4_0_release_notes.md b/guides/source/4_0_release_notes.md
index cce5bc533177c..54fe49252f176 100644
--- a/guides/source/4_0_release_notes.md
+++ b/guides/source/4_0_release_notes.md
@@ -141,6 +141,8 @@ Action Mailer
     end
     ```
 
+*   Allow for callbacks in mailers similar to ActionController::Base. You can now set up headers/attachments using `before_filter` or `after_filter`. You could also change delivery settings or prevent delivery in an after filter based on instance variables set in your mailer action. You have access to `ActionMailer::Base` instance methods like `message`, `attachments`, `headers`.
+
 Action Pack
 -----------