1 files changed, 15 insertions, 26 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 9feca324a3..ba9e1b0607 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,35 +1,24 @@
-## Rails 4.0.0 (unreleased) ##
+*   Template lookup now respects default locale and I18n fallbacks.
 
-*   Explicit multipart messages no longer set the order of the MIME parts.
-    *Nate Berkopec*
+    Given the following templates:
 
-*   Do not render views when mail() isn't called.
-    Fix #7761
+        mailer/demo.html.erb
+        mailer/demo.en.html.erb
+        mailer/demo.pt.html.erb
 
-    *Yves Senn*
+    Before this change, for a locale that doesn't have its associated file, the
+    `mailer/demo.html.erb` would be rendered even if `en` was the default locale.
 
-*   Allow delivery method options to be set per mail instance *Aditya Sanghi*
+    Now `mailer/demo.en.html.erb` has precedence over the file without locale.
 
-    If your smtp delivery settings are dynamic,
-    you can now override settings per mail instance for e.g.
+    Also, it is possible to give a fallback.
 
-        def my_mailer(user,company)
-          mail to: user.email, subject: "Welcome!",
-               delivery_method_options: { user_name: company.smtp_user,
-                                          password: company.smtp_password }
-        end
+        mailer/demo.pt.html.erb
+        mailer/demo.pt-BR.html.erb
 
-    This will ensure that your default SMTP settings will be overridden
-    by the company specific ones. You only have to override the settings
-    that are dynamic and leave the static setting in your environment
-    configuration file (e.g. config/environments/production.rb)
+    So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given
+    the right I18n fallback configuration.
 
-*   Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki*
+    *Rafael Mendonça França*
 
-*   Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
-
-*   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.
+Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/actionmailer/CHANGELOG.md) for previous changes.