diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
index c6632c65..ae56f4eb 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.haml
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -4,5 +4,6 @@
     = APP_CONFIG['site_name']
   = succeed '!' do
     = @resource.screen_name
+%p  
 %p{style: "margin:0px;padding:0px"} You can confirm your account email through the link below:
 %p{style: "margin:0px;padding:0px"}= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
diff --git a/app/views/devise/mailer/reset_password_instructions.html.haml b/app/views/devise/mailer/reset_password_instructions.html.haml
index 9013ea51..00c50a44 100644
--- a/app/views/devise/mailer/reset_password_instructions.html.haml
+++ b/app/views/devise/mailer/reset_password_instructions.html.haml
@@ -1,8 +1,10 @@
 %p{style: "margin:0px;padding:0px"}
   Hello
-  = succeed '!'
-   = @resource.screen_name
+  = succeed '!' do
+    = @resource.screen_name
+%p  
 %p{style: "margin:0px;padding:0px"} Someone (hopefully you) has requested a link to change your password. You can do this through the link below.
 %p{style: "margin:0px;padding:0px"}= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
+%p  
 %p{style: "margin:0px;padding:0px"} If you didn't request this, please ignore this email.
 %p{style: "margin:0px;padding:0px"} Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/reset_password_instructions.text.erb b/app/views/devise/mailer/reset_password_instructions.text.erb
index 695942fb..2cf6e7fa 100644
--- a/app/views/devise/mailer/reset_password_instructions.text.erb
+++ b/app/views/devise/mailer/reset_password_instructions.text.erb
@@ -1,9 +1,9 @@
-Hello <%= @resource.screen_name %>
+Hello <%= @resource.screen_name %>!
 
 Someone (hopefully you) has requested a link to change your password.
 You can do this by copying the link below and entering it into your browser.
 
-<%= edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http) %>
+<%= edit_password_url(@resource, reset_password_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http)) %>
 
 If you didn't request this, please ignore this email.
 Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.haml b/app/views/devise/mailer/unlock_instructions.html.haml
index 490cf346..eb427845 100644
--- a/app/views/devise/mailer/unlock_instructions.html.haml
+++ b/app/views/devise/mailer/unlock_instructions.html.haml
@@ -1,7 +1,8 @@
 %p{style: "margin:0px;padding:0px"}
   Hello
-  = succeed '!'
-   = @resource.screen_name
+  = succeed '!' do
+    = @resource.screen_name
+%p &nbsp;
 %p{style: "margin:0px;padding:0px"} Your account has been locked due to an excessive number of unsuccessful sign in attempts.
 %p{style: "margin:0px;padding:0px"} Click the link below to unlock your account:
 %p{style: "margin:0px;padding:0px"}= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token, protocol: (APP_CONFIG['https'] ? :https : :http))
diff --git a/app/views/devise/mailer/unlock_instructions.text.erb b/app/views/devise/mailer/unlock_instructions.text.erb
index 73356bfd..e19494f0 100644
--- a/app/views/devise/mailer/unlock_instructions.text.erb
+++ b/app/views/devise/mailer/unlock_instructions.text.erb
@@ -1,4 +1,4 @@
-Hello <%= @resource.screen_name %>
+Hello <%= @resource.screen_name %>!
 
 Your account has been locked due to an excessive number of unsuccessful
 sign in attempts. You can unlock your account by copying the link below
diff --git a/app/views/layouts/mail.html.haml b/app/views/layouts/mail.html.haml
index 7ab7c138..3b06a584 100644
--- a/app/views/layouts/mail.html.haml
+++ b/app/views/layouts/mail.html.haml
@@ -1,17 +1,16 @@
 %html
   %head
-    %style{type: "text/css"}
-      :css
-        body {
-          font-size: 16px;
-          margin-top: 0px;
-          margin-bottom: 0px;
-          font-family: Arial, sans-serif;
-        }
-        p {
-          margin: 0px;
-          padding: 0px;
-        }
+    :css
+      body {
+        font-size: 16px;
+        margin-top: 0px;
+        margin-bottom: 0px;
+        font-family: Arial, sans-serif;
+      }
+      p {
+        margin: 0px;
+        padding: 0px;
+      }
   %body
     %table{cellpadding: 0, cellspacing: 0, border: 5, bordercolor: "#5e35b1", bgcolor: "#5e35b1", style: "font-size:0px;", align: "center", width: "630"}
       %tbody