diff --git a/config/dev/config.yaml b/config/dev/config.yaml
index 8a5ee9b..f6de058 100644
--- a/config/dev/config.yaml
+++ b/config/dev/config.yaml
@@ -19,3 +19,4 @@ alt_ssh_port: 55555
 external_outgoing_mail_domain: serpro.gov.br
 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
 google_analytics_id: 'UA-64206731-2'
+disable_send_emails: true
diff --git a/cookbooks/mailman/files/centos/master.cf b/cookbooks/mailman/files/centos/master.cf
index 2087147..77ba110 100644
--- a/cookbooks/mailman/files/centos/master.cf
+++ b/cookbooks/mailman/files/centos/master.cf
@@ -126,3 +126,8 @@ scache    unix  -       -       n       -       1       scache
 mailman   unix  -       n       n       -       -       pipe
   flags=FR user=mailman:mailman argv=/usr/lib/mailman/bin/postfix-to-mailman.py
   ${nexthop} ${user}
+
+fs_mail   unix  -       n       n       -       -       pipe
+  flags=F user=spb argv=tee --append /var/tmp/fs_mail.dump
+
+
diff --git a/cookbooks/mailman/recipes/default.rb b/cookbooks/mailman/recipes/default.rb
index cb1e3da..24f6c50 100644
--- a/cookbooks/mailman/recipes/default.rb
+++ b/cookbooks/mailman/recipes/default.rb
@@ -83,16 +83,16 @@ cookbook_file '/etc/cron.d/mailman-spb' do
   mode 0644
 end
 
-execute 'postfix:disable-email-prod' do
+execute 'postfix:disable-send-emails' do
   command "postconf 'default_transport = fs_mail'"
-  not_if  "cat /etc/postfix/main.cf | grep 'default_transport = fs_mail'"
-  action :nothing
+  only_if "#{node['config']['disable_send_emails']}"
+end
+
+execute 'postfix:enable-send-emails' do
+  command "postconf 'default_transport = smtp'"
+  not_if "#{node['config']['disable_send_emails']}"
 end
 
 cookbook_file '/etc/postfix/master.cf' do
-  unless node['environment'] == "prod"
-    source 'master.cf.development'
-    notifies :run, 'execute[postfix:disable-email-prod]'
-  end
-  notifies :restart, 'service[postfix]'
+  notifies :reload, 'service[postfix]'
 end
--
libgit2 0.21.2