diff --git a/roles/mail/tasks/msmtp.yml b/roles/mail/tasks/msmtp.yml
index b71d5eb..d0cbe00 100644
--- a/roles/mail/tasks/msmtp.yml
+++ b/roles/mail/tasks/msmtp.yml
@@ -41,3 +41,20 @@
   copy: src=cronie-service-msmtp.conf dest=/etc/systemd/system/cronie.service.d/msmtp.conf
   tags:
     - msmtp
+
+- name: Copy msmtpq script
+  copy: src=/usr/share/doc/msmtp/msmtpq/msmtpq dest=/usr/local/bin/ mode=0755
+  tags:
+    - msmtp
+
+- name: Copy msmtp-queue script
+  copy: src=/usr/share/doc/msmtp/msmtpq/msmtp-queue dest=/usr/local/bin/ mode=0755
+  tags:
+    - msmtp
+
+- name: Create msmtp queue directory
+  file: path=/home/{{ user.name }}/.msmtp.queue state=directory mode=0700
+  become: yes
+  become_user: "{{ user.name }}"
+  tags:
+    - msmtp