changeset 6136:c82f90f4fc19

notifications: new email templates with html styling - with heavy interfering and hacking by Mads Kiilerich.
author Kateryna Musina <kateryna@unity3d.com>
date Mon, 14 Mar 2016 15:30:22 +0100
parents 8b75085c2c02
children 3521120e72bc
files kallithea/model/notification.py kallithea/templates/email_templates/button.html kallithea/templates/email_templates/changeset_comment.html kallithea/templates/email_templates/comment.html kallithea/templates/email_templates/default.html kallithea/templates/email_templates/header.html kallithea/templates/email_templates/main.html kallithea/templates/email_templates/password_reset.html kallithea/templates/email_templates/pull_request.html kallithea/templates/email_templates/pull_request_comment.html kallithea/templates/email_templates/registration.html kallithea/tests/models/test_dump_html_mails.ref.html
diffstat 12 files changed, 2285 insertions(+), 408 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/model/notification.py	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/model/notification.py	Mon Mar 14 15:30:22 2016 +0100
@@ -326,5 +326,21 @@
                    'h': h,
                    'c': c}
         _kwargs.update(kwargs)
+        if content_type == 'html':
+            _kwargs.update({
+                "color_text": "#202020",
+                "color_emph": "#395fa0",
+                "color_link": "#395fa0",
+                "color_border": "#ddd",
+                "color_background_grey": "#f9f9f9",
+                "color_button": "#395fa0",
+                "monospace_style": "font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace",
+                "sans_style": "font-family:Helvetica,Arial,sans-serif",
+                })
+            _kwargs.update({
+                "default_style": "%(sans_style)s;font-weight:200;font-size:14px;line-height:17px;color:%(color_text)s" % _kwargs,
+                "comment_style": "%(monospace_style)s;white-space:pre-wrap" % _kwargs,
+                })
+
         log.debug('rendering tmpl %s with kwargs %s', base, _kwargs)
         return email_template.render(**_kwargs)
--- a/kallithea/templates/email_templates/button.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/button.html	Mon Mar 14 15:30:22 2016 +0100
@@ -1,8 +1,26 @@
 <%page args="url,title='',padding_top=True,padding_bottom=True" />\
 ##<!-- button -->
-<p>
-            <a href="${url}" target="_blank">
-                        ${_(title)}
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    %if padding_top:
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    %endif
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px ${color_button}">
+            <a href="${url}" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+    %if padding_bottom:
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    %endif
+</table>
 ##<!-- /button -->
--- a/kallithea/templates/email_templates/changeset_comment.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/changeset_comment.html	Mon Mar 14 15:30:22 2016 +0100
@@ -5,15 +5,35 @@
 <%include file="header.html" args="title=title,link=cs_comment_url"/>\
 </%block>\
 \
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
 <%include file="comment.html" args="text=body,author=cs_comment_user,status=status_change"/>\
-            <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 ${_('Changeset on')}
-                <a href="${cs_target_repo}">${cs_target_repo}</a>
+                <a style="color:${color_link};text-decoration:none"
+                   href="${cs_target_repo}">${cs_target_repo}</a>
                 ${_('branch')}
-                ${branch}:
-                <br/>
-                "<a href="${cs_url}">${h.shorter(message, 60, firstline=True)}</a>"
+                <span style="color:${color_link}">${branch}</span>:
+            </div>
+            <div>
+                "<a style="color:${color_link};text-decoration:none"
+                   href="${cs_url}">${h.shorter(message, 60, firstline=True)}</a>"
                 ${_('by')}
-                ${cs_author.full_name_and_username}.
-            </p>
+                <span style="color:${color_link}">${cs_author.full_name_and_username}</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
 <%include file="button.html" args="url=cs_comment_url,title=_('View Comment'),padding_bottom=False"/>\
+        </td>
+    </tr>
+</table>
--- a/kallithea/templates/email_templates/comment.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/comment.html	Mon Mar 14 15:30:22 2016 +0100
@@ -1,17 +1,57 @@
 <%page args="author,text,status,close=False" />\
 \
 ##<!-- comment ->
-            <h2>${author}</h2>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="${color_background_grey}" style="border:1px solid ${color_border};border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:${color_emph}">${author}</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td>
+    </tr>
+    %if status or close:
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
                 %if status:
-                    <p>
+                    <div style="font-weight:600">
                         ${_('Status change:')}
                         ${status}
-                    </p>
+                    </div>
                 %endif
                 %if close:
-                    <p>
+                    <div style="font-weight:600">
                         ${_('The pull request has been closed.')}
-                    </p>
+                    </div>
                 %endif
-                <div style="font-family:monospace;white-space:pre-wrap">${text}</div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid ${color_border}"></td>
+        </tr>
+    %endif
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="${comment_style}">${text}</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
 ##<!-- /comment ->
--- a/kallithea/templates/email_templates/default.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/default.html	Mon Mar 14 15:30:22 2016 +0100
@@ -4,4 +4,8 @@
 <%include file="header.html" args="title=_('Message'),link=None"/>\
 </%block>\
 \
-        <div style="font-family:monospace;white-space:pre-wrap">${body}</div>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td style="${comment_style}">${body}</td>
+    </tr>
+</table>
--- a/kallithea/templates/email_templates/header.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/header.html	Mon Mar 14 15:30:22 2016 +0100
@@ -1,12 +1,25 @@
 <%page args="title,link" />\
 \
 ##<!-- header -->
-    <h1>
+<table bgcolor="${color_background_grey}" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid ${color_border}">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="${sans_style};font-size:19px;line-height:24px">
         %if link is not None:
-            <a href="${link}"
+            <a style="text-decoration:none;color:${color_emph}" href="${link}"
                target="_blank">${title}</a>
         %else:
-            ${title}
+            <span style="color:${color_emph}">${title}</span>
         %endif
-    </h1>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
 ##<!-- /header -->
--- a/kallithea/templates/email_templates/main.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/main.html	Mon Mar 14 15:30:22 2016 +0100
@@ -6,8 +6,37 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 </head>
 <body>
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;${default_style}">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;${sans_style};border:1px solid ${color_border}">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<%block name="header"/>\
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
                         ##<!-- body -->
 ${self.body()}\
                         ##<!-- /body -->
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 </body>
 </html>
--- a/kallithea/templates/email_templates/password_reset.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/password_reset.html	Mon Mar 14 15:30:22 2016 +0100
@@ -4,23 +4,44 @@
 <%include file="header.html" args="title=_('Password Reset Request'),link=None"/>\
 </%block>\
 \
-            <h2>${_('Hello %s') % user},</h2>
-            <p>
-                ${_('We have received a request to reset the password for your account.')}
-            </p>
-            <p>
-
+<table cellpadding="0" cellspacing="0" border="0" width="100%" style="table-layout:fixed;word-wrap:break-word;">
+    <tr>
+        <td>${_('Hello %s') % user},</td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
+            ${_('We have received a request to reset the password for your account.')}
+        </td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
             %if reset_token is None:
-                ${_('This account is however managed outside this system and the password cannot be changed here.')}
+                <div>${_('This account is however managed outside this system and the password cannot be changed here.')}</div>
             %else:
+                <div>
                     ${_('To set a new password, click the following link')}:
                     <br/>
-                    <a href="${reset_url}"
+                    <a style="color:${color_link};text-decoration:none" href="${reset_url}"
                         target="_blank">${reset_url}</a>
                     <br/>
                     ${_("Should you not be able to use the link above, please type the following code into the password reset form")}:
                     <code>${reset_token}</code>
+                </div>
             %endif
-            <p>
-                ${_("If it weren't you who requested the password reset, just disregard this message.")}
-            </p>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
+            ${_("If it weren't you who requested the password reset, just disregard this message.")}
+        </td>
+    </tr>
+</table>
--- a/kallithea/templates/email_templates/pull_request.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/pull_request.html	Mon Mar 14 15:30:22 2016 +0100
@@ -5,33 +5,69 @@
 <%include file="header.html" args="title=title,link=pr_url"/>\
 </%block>\
 \
-            <p>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+            <div>
                 ${_('Pull request from')}
-                <a href="${pr_source_repo}">${pr_source_repo}</a>
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_source_repo}">${pr_source_repo}</a>
                 ${_('at')}
-                ${pr_source_branch}
+                <span style="color:${color_link}">${pr_source_branch}</span>
                 ${_('to')}
-                <a href="${pr_target_repo}">${pr_target_repo}</a>
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_target_repo}">${pr_target_repo}</a>
                 ${_('at')}
-                ${pr_target_branch}:
-                <br/>
-                <a href="${pr_url}">${pr_nice_id}</a>
-                "${pr_title}"
+                <span style="color:${color_link}">${pr_target_branch}</span>:
+            </div>
+            <div>
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_url}">${pr_nice_id}</a>
+                "<span style="color:${color_link}">${pr_title}</span>"
                 ${_('by')}
-                ${pr_owner.full_name_and_username}.
-            </p>
-            <p>
+                <span style="color:${color_link}">${pr_owner.full_name_and_username}</span>.
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div>
                 ${_('Description')}:
-            </p>
-            <div style="font-family:monospace;white-space:pre-wrap">${body}</div>
-            <p>${_('Changesets')}:</p>
-            <ul>
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div style="${comment_style};color:${color_link}">${body}</div>
+        </td>
+    </tr>
+    <tr><td height="15px"></td></tr>
+    <tr>
+        <td>
+            <div>${_('Changesets')}:</div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+
+    <tr>
+        <td style="${sans_style}">
+            <ul style="color:${color_link};padding-left:15px;margin:0">
                 %for revision, desc in pr_revisions:
                     <li>
-                        <a href="${h.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}">
+                        <a style="color:${color_link};text-decoration:none"
+                           href="${h.canonical_url('changeset_home', repo_name=org_repo_name, revision=revision)}">
                             ${h.shorter(desc, 80, firstline=True)}
                         </a>
                     </li>
                 %endfor
             </ul>
+        </td>
+    </tr>
+    <tr>
+        <td>
 <%include file="button.html" args="url=pr_url,title=_('View Pull Request'),padding_bottom=False"/>\
+        </td>
+    </tr>
+</table>
--- a/kallithea/templates/email_templates/pull_request_comment.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/pull_request_comment.html	Mon Mar 14 15:30:22 2016 +0100
@@ -5,20 +5,41 @@
 <%include file="header.html" args="title=title,link=pr_comment_url"/>\
 </%block>\
 \
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
 <%include file="comment.html" args="text=body,author=pr_comment_user,status=status_change,close=closing_pr"/>\
-            <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 ${_('Pull request from')}
-                <a href="${pr_source_repo}">${pr_source_repo}</a>
-                ${_('at')}
-                ${pr_source_branch}
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_source_repo}">${pr_source_repo}</a>
+                ${_('branch')}
+                <span style="color:${color_link}">${pr_source_branch}</span>
                 ${_('to')}
-                <a href="${pr_target_repo}">${pr_target_repo}</a>
-                ${_('at')}
-                ${pr_target_branch}:
-                <br/>
-                <a href="${pr_url}">${pr_nice_id}</a>
-                "${pr_title}"
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_target_repo}">${pr_target_repo}</a>
+                ${_('branch')}
+                <span style="color:${color_link}">${pr_target_branch}</span>:
+            </div>
+            <div>
+                <a style="color:${color_link};text-decoration:none"
+                   href="${pr_url}">${pr_nice_id}</a>
+                "<span style="color:${color_link}">${pr_title}</span>"
                 ${_('by')}
-                ${pr_owner.full_name_and_username}.
-            </p>
+                <span style="color:${color_link}">${pr_owner.full_name_and_username}</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
 <%include file="button.html" args="url=pr_comment_url,title=_('View Comment'),padding_bottom=False"/>\
+        </td>
+    </tr>
+</table>
--- a/kallithea/templates/email_templates/registration.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/templates/email_templates/registration.html	Mon Mar 14 15:30:22 2016 +0100
@@ -5,19 +5,40 @@
 <%include file="header.html" args="title=_('New User Registration'),link=registered_user_url"/>\
 </%block>\
 \
-        <p>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
             ${_('Username')}:
-            <br/>
+        </td>
+        <td style="color:${color_link}">
             ${new_username}
-        </p>
-        <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="2"></td>
+    </tr>
+    <tr>
+        <td>
             ${_('Full Name')}:
-            <br/>
+        </td>
+        <td style="color:${color_link}">
             ${new_full_name}
-        </p>
-        <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="2"></td>
+    </tr>
+    <tr>
+        <td>
             ${_('Email')}:
-            <br/>
+        </td>
+        <td style="color:${color_link}">
             ${new_email}
-        </p>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2">
 <%include file="button.html" args="url=registered_user_url,title=_('View User Profile'),padding_bottom=False"/>\
+        </td>
+    </tr>
+</table>
--- a/kallithea/tests/models/test_dump_html_mails.ref.html	Thu Jul 28 16:44:24 2016 +0200
+++ b/kallithea/tests/models/test_dump_html_mails.ref.html	Mon Mar 14 15:30:22 2016 +0100
@@ -37,29 +37,127 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://comment.org"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
 
  - and here it ends indented.</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Changeset on
-                <a href="repo_target">repo_target</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="repo_target">repo_target</a>
                 branch
-                brunch:
-                <br/>
-                "<a href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
+                <span style="color:#395fa0">brunch</span>:
+            </div>
+            <div>
+                "<a style="color:#395fa0;text-decoration:none"
+                   href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://comment.org" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -98,29 +196,127 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://comment.org"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Mention in Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
 
  - and here it ends indented.</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Changeset on
-                <a href="repo_target">repo_target</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="repo_target">repo_target</a>
                 branch
-                brunch:
-                <br/>
-                "<a href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
+                <span style="color:#395fa0">brunch</span>:
+            </div>
+            <div>
+                "<a style="color:#395fa0;text-decoration:none"
+                   href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://comment.org" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -161,33 +357,143 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://comment.org"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Approved
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
 
  - and here it ends indented.</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Changeset on
-                <a href="repo_target">repo_target</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="repo_target">repo_target</a>
                 branch
-                brunch:
-                <br/>
-                "<a href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
+                <span style="color:#395fa0">brunch</span>:
+            </div>
+            <div>
+                "<a style="color:#395fa0;text-decoration:none"
+                   href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://comment.org" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -228,33 +534,143 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://comment.org"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://comment.org"
                target="_blank">Mention in Comment on Changeset &#34;This changeset did something clever which is hard to explain&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Approved
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the new comment.
 
  - and here it ends indented.</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Changeset on
-                <a href="repo_target">repo_target</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="repo_target">repo_target</a>
                 branch
-                brunch:
-                <br/>
-                "<a href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
+                <span style="color:#395fa0">brunch</span>:
+            </div>
+            <div>
+                "<a style="color:#395fa0;text-decoration:none"
+                   href="http://changeset.com">This changeset did something clever which is hard to explain</a>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://comment.org" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://comment.org" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -277,11 +693,56 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            Message
-    </h1>
-        <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message
- - nothing interesting here except indentation.</div></div>
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <span style="color:#395fa0">Message</span>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">This is the body of the test message
+ - nothing interesting here except indentation.</div></td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -316,30 +777,103 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://newbie.org"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://newbie.org"
                target="_blank">New User Registration</a>
-    </h1>
-        <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
             Username:
-            <br/>
+        </td>
+        <td style="color:#395fa0">
             newbie
-        </p>
-        <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="2"></td>
+    </tr>
+    <tr>
+        <td>
             Full Name:
-            <br/>
+        </td>
+        <td style="color:#395fa0">
             New Full Name
-        </p>
-        <p>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="2"></td>
+    </tr>
+    <tr>
+        <td>
             Email:
-            <br/>
+        </td>
+        <td style="color:#395fa0">
             new@email.com
-        </p>
-<p>
-            <a href="http://newbie.org" target="_blank">
-                        View User Profile
+        </td>
+    </tr>
+    <tr>
+        <td colspan="2">
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://newbie.org" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -383,48 +917,137 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/7"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/7"
                target="_blank">Added as Reviewer of Pull Request #7 &#34;The Title&#34; by Requesting User (root)</a>
-    </h1>
-            <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
-                to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
                 at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <span style="color:#395fa0">devbranch</span>
+                to
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                at
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-            <p>
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div>
                 Description:
-            </p>
-            <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This PR is awesome because it does stuff
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></div>
-            <p>Changesets:</p>
-            <ul>
+        </td>
+    </tr>
+    <tr><td height="15px"></td></tr>
+    <tr>
+        <td>
+            <div>Changesets:</div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+
+    <tr>
+        <td style="font-family:Helvetica,Arial,sans-serif">
+            <ul style="color:#395fa0;padding-left:15px;margin:0">
                     <li>
-                        <a href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
+                        <a style="color:#395fa0;text-decoration:none"
+                           href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
                             Introduce one and two
                         </a>
                     </li>
                     <li>
-                        <a href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
+                        <a style="color:#395fa0;text-decoration:none"
+                           href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
                             Make one plus two equal tree
                         </a>
                     </li>
             </ul>
-<p>
-            <a href="http://pr.org/7" target="_blank">
-                        View Pull Request
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -468,48 +1091,137 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/7"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/7"
                target="_blank">Mention on Pull Request #7 &#34;The Title&#34; by Requesting User (root)</a>
-    </h1>
-            <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
-                to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
                 at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <span style="color:#395fa0">devbranch</span>
+                to
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                at
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-            <p>
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div>
                 Description:
-            </p>
-            <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">This PR is awesome because it does stuff
+            </div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+    <tr>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap;color:#395fa0"><div class="formatted-fixed">This PR is awesome because it does stuff
  - please approve indented!</div></div>
-            <p>Changesets:</p>
-            <ul>
+        </td>
+    </tr>
+    <tr><td height="15px"></td></tr>
+    <tr>
+        <td>
+            <div>Changesets:</div>
+        </td>
+    </tr>
+    <tr><td height="10px"></td></tr>
+
+    <tr>
+        <td style="font-family:Helvetica,Arial,sans-serif">
+            <ul style="color:#395fa0;padding-left:15px;margin:0">
                     <li>
-                        <a href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
+                        <a style="color:#395fa0;text-decoration:none"
+                           href="http://changeset_home/?repo_name=repo_org&amp;revision=123abc123abc123abc123abc123abc123abc123abc">
                             Introduce one and two
                         </a>
                     </li>
                     <li>
-                        <a href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
+                        <a style="color:#395fa0;text-decoration:none"
+                           href="http://changeset_home/?repo_name=repo_org&amp;revision=567fed567fed567fed567fed567fed567fed567fed">
                             Make one plus two equal tree
                         </a>
                     </li>
             </ul>
-<p>
-            <a href="http://pr.org/7" target="_blank">
-                        View Pull Request
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/7" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -548,34 +1260,133 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -614,34 +1425,133 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Mention in Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -682,38 +1592,149 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Under Review
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -754,38 +1775,149 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Mention in Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Under Review
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -826,37 +1958,148 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Pull Request #7 &#34;The Title&#34; Closed</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         The pull request has been closed.
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -897,37 +2140,148 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Mention in Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         The pull request has been closed.
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -970,41 +2324,152 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Pull Request #7 &#34;The Title&#34; Closed</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Under Review
-                    </p>
-                    <p>
+                    </div>
+                    <div style="font-weight:600">
                         The pull request has been closed.
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -1047,41 +2512,152 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            <a href="http://pr.org/comment"
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <a style="text-decoration:none;color:#395fa0" href="http://pr.org/comment"
                target="_blank">Mention in Comment on Pull Request #7 &#34;The Title&#34;</a>
-    </h1>
-            <h2>Opinionated User (jsmith)</h2>
-                    <p>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td>
+<table cellpadding="0" cellspacing="0" width="100%" border="0" bgcolor="#f9f9f9" style="border:1px solid #ddd;border-radius:4px">
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-weight:600;color:#395fa0">Opinionated User (jsmith)</div>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+    </tr>
+        <tr>
+            <td height="10px" colspan="3"></td>
+        </tr>
+        <tr>
+            <td width="20px"></td>
+            <td>
+                    <div style="font-weight:600">
                         Status change:
                         Under Review
-                    </p>
-                    <p>
+                    </div>
+                    <div style="font-weight:600">
                         The pull request has been closed.
-                    </p>
-                <div style="font-family:monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
+                    </div>
+            </td>
+            <td width="20px"></td>
+        </tr>
+        <tr>
+            <td height="10px" colspan="3" style="border-bottom:1px solid #ddd"></td>
+        </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="20px"></td>
+        <td>
+            <div style="font-family:Lucida Console,Consolas,Monaco,Inconsolata,Liberation Mono,monospace;white-space:pre-wrap"><div class="formatted-fixed">Me too!
 
  - and indented on second line</div></div>
-            <p>
+        </td>
+        <td width="20px"></td>
+    </tr>
+    <tr>
+        <td height="10px" colspan="3"></td>
+    </tr>
+</table>
+        </td>
+    </tr>
+    <tr>
+        <td height="30px"></td>
+    </tr>
+    <tr>
+        <td>
+            <div>
                 Pull request from
-                <a href="https://dev.org/repo">https://dev.org/repo</a>
-                at
-                devbranch
+                <a style="color:#395fa0;text-decoration:none"
+                   href="https://dev.org/repo">https://dev.org/repo</a>
+                branch
+                <span style="color:#395fa0">devbranch</span>
                 to
-                <a href="http://mainline.com/repo">http://mainline.com/repo</a>
-                at
-                trunk:
-                <br/>
-                <a href="http://pr.org/7">#7</a>
-                "The Title"
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://mainline.com/repo">http://mainline.com/repo</a>
+                branch
+                <span style="color:#395fa0">trunk</span>:
+            </div>
+            <div>
+                <a style="color:#395fa0;text-decoration:none"
+                   href="http://pr.org/7">#7</a>
+                "<span style="color:#395fa0">The Title</span>"
                 by
-                u2 u3 (u2).
-            </p>
-<p>
-            <a href="http://pr.org/comment" target="_blank">
-                        View Comment
+                <span style="color:#395fa0">u2 u3 (u2)</span>.
+            </div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+<table cellspacing="0" cellpadding="0" style="margin-left:auto;margin-right:auto">
+    <tr>
+        <td height="25px"></td>
+    </tr>
+    <tr>
+        <td style="border-collapse:collapse;border-radius:2px;text-align:center;display:block;border:solid 1px #395fa0">
+            <a href="http://pr.org/comment" style="text-decoration:none;display:block" target="_blank">
+                <center style="padding:7px 16px 11px 16px">
+                    <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>
+                </center>
             </a>
-</p>
+        </td>
+    </tr>
+</table>
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>
@@ -1117,25 +2693,87 @@
     <!--meta http-equiv="Content-Type" content="text/html; charset=UTF-8"-->
 <!--/head-->
 <!--body-->
-    <h1>
-            Password Reset Request
-    </h1>
-            <h2>Hello John Doe,</h2>
-            <p>
-                We have received a request to reset the password for your account.
-            </p>
-            <p>
-
+<table align="center" cellpadding="0" cellspacing="0" border="0" style="min-width:348px;max-width:800px;font-family:Helvetica,Arial,sans-serif;font-weight:200;font-size:14px;line-height:17px;color:#202020">
+    <tr>
+        <td width="30px"></td>
+        <td>
+            <table width="100%" cellpadding="0" cellspacing="0" border="0"
+                   style="table-layout:fixed;font-family:Helvetica,Arial,sans-serif;border:1px solid #ddd">
+                <tr><td width="30px"></td><td></td><td width="30px"></td></tr>
+                <tr>
+                    <td colspan="3">
+<table bgcolor="#f9f9f9" width="100%" cellpadding="0" cellspacing="0"
+       style="border-bottom:1px solid #ddd">
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+    <tr>
+        <td width="30px"></td>
+        <td style="font-family:Helvetica,Arial,sans-serif;font-size:19px;line-height:24px">
+            <span style="color:#395fa0">Password Reset Request</span>
+        </td>
+        <td width="30px"></td>
+    </tr>
+    <tr>
+        <td height="20px" colspan="3"></td>
+    </tr>
+</table>
+                    </td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+                <tr>
+                    <td></td>
+                    <td>
+<table cellpadding="0" cellspacing="0" border="0" width="100%" style="table-layout:fixed;word-wrap:break-word;">
+    <tr>
+        <td>Hello John Doe,</td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
+            We have received a request to reset the password for your account.
+        </td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
+                <div>
                     To set a new password, click the following link:
                     <br/>
-                    <a href="http://reset.com/decbf64715098db5b0bd23eab44bd792670ab746"
+                    <a style="color:#395fa0;text-decoration:none" href="http://reset.com/decbf64715098db5b0bd23eab44bd792670ab746"
                         target="_blank">http://reset.com/decbf64715098db5b0bd23eab44bd792670ab746</a>
                     <br/>
                     Should you not be able to use the link above, please type the following code into the password reset form:
                     <code>decbf64715098db5b0bd23eab44bd792670ab746</code>
-            <p>
-                If it weren&#39;t you who requested the password reset, just disregard this message.
-            </p>
+                </div>
+        </td>
+    </tr>
+    <tr>
+        <td height="10px"></td>
+    </tr>
+    <tr>
+        <td>
+            If it weren&#39;t you who requested the password reset, just disregard this message.
+        </td>
+    </tr>
+</table>
+                    </td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td height="30px" colspan="3"></td>
+                </tr>
+            </table>
+        </td>
+        <td width="30px"></td>
+    </tr>
+</table>
 <!--/body-->
 <!--/html-->
 <hr/>