diff --git a/kallithea/templates/email_templates/button.html b/kallithea/templates/email_templates/button.html
--- a/kallithea/templates/email_templates/button.html
+++ b/kallithea/templates/email_templates/button.html
@@ -8,9 +8,9 @@
         </tr>
         %endif
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px ${color_button}">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px ${color_button};padding:11px 20px 11px 20px">
                 <a href="${url}" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="${sans_style};font-weight:700;font-size:15px;line-height:14px;color:${color_button};white-space:nowrap;vertical-align:middle">${_(title)}</span>
                         </font>
diff --git a/kallithea/tests/models/test_dump_html_mails.ref.html b/kallithea/tests/models/test_dump_html_mails.ref.html
--- a/kallithea/tests/models/test_dump_html_mails.ref.html
+++ b/kallithea/tests/models/test_dump_html_mails.ref.html
@@ -132,9 +132,9 @@ View Comment: http://comment.org
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -291,9 +291,9 @@ View Comment: http://comment.org
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -468,9 +468,9 @@ View Comment: http://comment.org
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -645,9 +645,9 @@ View Comment: http://comment.org
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -849,9 +849,9 @@ View User Profile: http://newbie.org
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://newbie.org" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View User Profile</span>
                         </font>
@@ -1024,9 +1024,9 @@ View Pull Request: http://pr.org/7
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span>
                         </font>
@@ -1199,9 +1199,9 @@ View Pull Request: http://pr.org/7
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Pull Request</span>
                         </font>
@@ -1364,9 +1364,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -1529,9 +1529,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -1712,9 +1712,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -1895,9 +1895,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -2077,9 +2077,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -2259,9 +2259,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -2447,9 +2447,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>
@@ -2635,9 +2635,9 @@ View Comment: http://pr.org/comment
             <td height="25px"></td>
         </tr>
         <tr>
-            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0;padding:11px 20px 11px 20px">
                 <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
-                    <center style="padding:11px 20px">
+                    <center>
                         <font size="3">
                             <span style="font-family:Helvetica,Arial,sans-serif;font-weight:700;font-size:15px;line-height:14px;color:#395fa0;white-space:nowrap;vertical-align:middle">View Comment</span>
                         </font>