diff --git a/handlers/main.yml b/handlers/main.yml
index d8150cd..e2c43b0 100755
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,7 @@
 ---
 # send test mail to admin
 - name: test mail
-  shell: echo "Test mail from new/updated MSTMP at" `hostname -f` | mail root -s "Test SMTP at `hostname -f`"
+  shell: echo -e "Test mail from new/updated mSTMP\n\n $(uname -a)" | mail -s "Test mSMTP at $(hostname -f)" root
   tags: mail
   when: msmtp_send_test_mail
   async: 30
diff --git a/tasks/main.yml b/tasks/main.yml
index b27e553..11eb4d7 100755
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -35,12 +35,12 @@
   notify: test mail
   when: ansible_os_family == "Debian"
 
-- name: Install msmtp and mailx on Archlinux.
+- name: Install msmtp and s-nail on Archlinux.
   pacman: name={{item}} state=present
   with_items:
     - msmtp
     - msmtp-mta
-    - mailutils
+    - s-nail
   when: ansible_os_family == "Archlinux"
 
 - name: Copy mstprc conf file.
diff --git a/tests/test.yml b/tests/test.yml
index 2f30642..6420616 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -4,3 +4,4 @@
 
   roles:
     - role: role_under_test
+      msmtp_send_test_mail: yes