diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74c1fd4..260bae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Note: Breaking changes between versions are indicated by "💥".
 
 ## Unreleased
 
+- [Bugfix] Make sure all emails (including "password reset") are properly saved to a local file in development mode (#315)
 - [Improvement] Add `openedx-development-settings` patch to patch the LMS and the CMS simultaneously in development 
 - [Bugfix] Fix missing celery tasks in the CMS
 
diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py
index 08d6cfe..e3d1ecd 100644
--- a/tutor/templates/apps/openedx/settings/partials/common_all.py
+++ b/tutor/templates/apps/openedx/settings/partials/common_all.py
@@ -37,7 +37,13 @@ LOGGING["handlers"]["tracking"] = {
 }
 LOGGING["loggers"]["tracking"]["handlers"] = ["console", "local", "tracking"]
 
+# Email
 EMAIL_USE_SSL = {{ SMTP_USE_SSL }}
+# Forward all emails from edX's Automated Communication Engine (ACE) to django.
+ACE_ENABLED_CHANNELS = ["django_email"]
+ACE_CHANNEL_DEFAULT_EMAIL = "django_email"
+ACE_CHANNEL_TRANSACTIONAL_EMAIL = "django_email"
+EMAIL_FILE_PATH = "/tmp/openedx/emails"
 
 LOCALE_PATHS.append("/openedx/locale")