diff --git a/puppet/zulip/files/cron.d/rabbitmq-numconsumers b/puppet/zulip/files/cron.d/rabbitmq-numconsumers
index 6d21664af1..92967b8c21 100644
--- a/puppet/zulip/files/cron.d/rabbitmq-numconsumers
+++ b/puppet/zulip/files/cron.d/rabbitmq-numconsumers
@@ -12,4 +12,5 @@ USER=root
 * * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file feedback_messages
 * * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file error_reports
 * * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file digest_emails
+* * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file email_mirror
 * * * * * root /home/zulip/deployments/current/bin/write-rabbitmq-consumers-state-file missedmessage_mobile_notifications
diff --git a/puppet/zulip/files/supervisor/conf.d/zulip.conf b/puppet/zulip/files/supervisor/conf.d/zulip.conf
index 3c0c509635..fe601f17a3 100644
--- a/puppet/zulip/files/supervisor/conf.d/zulip.conf
+++ b/puppet/zulip/files/supervisor/conf.d/zulip.conf
@@ -200,6 +200,18 @@ redirect_stderr=true           ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/zulip/events-digest_emails.log         ; stdout log path, NONE for none; default AUTO
 directory=/home/zulip/deployments/current/
 
+[program:zulip-events-email_mirror]
+command=python /home/zulip/deployments/current/manage.py process_queue email_mirror
+priority=600                   ; the relative start priority (default 999)
+autostart=true                 ; start at supervisord start (default: true)
+autorestart=true               ; whether/when to restart (default: unexpected)
+stopsignal=TERM                ; signal used to kill process (default TERM)
+stopwaitsecs=30                ; max num secs to wait b4 SIGKILL (default 10)
+user=zulip                    ; setuid to this UNIX account to run the program
+redirect_stderr=true           ; redirect proc stderr to stdout (default false)
+stdout_logfile=/var/log/zulip/events-email_mirror.log         ; stdout log path, NONE for none; default AUTO
+directory=/home/zulip/deployments/current/
+
 [program:zulip-deliver-enqueued-emails]
 command=python /home/zulip/deployments/current/manage.py deliver_email
 priority=600                   ; the relative start priority (default 999)
@@ -219,7 +231,7 @@ directory=/home/zulip/deployments/current/
 
 [group:zulip-workers]
 ; each refers to 'x' in [program:x] definitions
-programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-events-user-presence,zulip-events-signups,zulip-events-confirmation-emails,zulip-events-missedmessage_reminders,zulip-events-slowqueries,zulip-events-feedback_messages,zulip-events-digest_emails,zulip-events-error_reports,zulip-deliver-enqueued-emails,zulip-events-missedmessage_mobile_notifications
+programs=zulip-events-user-activity,zulip-events-user-activity-interval,zulip-events-user-presence,zulip-events-signups,zulip-events-confirmation-emails,zulip-events-missedmessage_reminders,zulip-events-slowqueries,zulip-events-feedback_messages,zulip-events-digest_emails,zulip-events-error_reports,zulip-deliver-enqueued-emails,zulip-events-missedmessage_mobile_notifications,zulip-events-email_mirror
 
 [group:zulip-senders]
 programs=zulip-events-message_sender