diff --git a/include/i18n/en_US/templates/email/assigned.alert.yaml b/include/i18n/en_US/templates/email/assigned.alert.yaml
index 7c4a1e5a445d8e664993f7e750412568a31efa33..7629ae55aa9f3b80cce6ac422c6635c2eebaf022 100644
--- a/include/i18n/en_US/templates/email/assigned.alert.yaml
+++ b/include/i18n/en_US/templates/email/assigned.alert.yaml
@@ -13,7 +13,7 @@ notes: |
     member.  Use %{assigner} to distinguish who made the assignment.
 
 subject: |
-    Ticket #%{ticket.number} Assigned to you
+    Ticket Assigned to you
 body: |
     <h3><strong>Hi %{assignee},</strong></h3>
     <p>
diff --git a/include/i18n/en_US/templates/email/message.autoresp.yaml b/include/i18n/en_US/templates/email/message.autoresp.yaml
index 8e86947b4a6d9006ebc70d739ce6d6790790fdfa..846a34af0c92b80f5e65c5716b8e30cf387c3ee0 100644
--- a/include/i18n/en_US/templates/email/message.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/message.autoresp.yaml
@@ -13,7 +13,7 @@ notes: |
     customer web portal and posts a new message there.
 
 subject: |
-    [#%{ticket.number}] Message Received
+    "Message Confirmation"
 body: |
     <h3><strong>Dear %{ticket.name},</strong></h3>
     <p>
diff --git a/include/i18n/en_US/templates/email/ticket.autoreply.yaml b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
index 19f833ea5f3ae926719408217c92addf58499a2f..10994f66c057e168e2ec684ee46f1fc8c6675962 100644
--- a/include/i18n/en_US/templates/email/ticket.autoreply.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoreply.yaml
@@ -13,77 +13,46 @@ notes: |
     Available variables for replacement: %{ticket.*}, %{response}
 
 subject: |
-    Support Ticket Opened [#%{ticket.number}]
+    Support Ticket Opened
 body: |
-    <table cellspacing="0">
-    <tbody>
-    <tr>
-        <td style="vertical-align: middle; border-bottom: 1px solid #ddd;
-            height: 48pt"> <span style="color: rgb(127, 127, 127); font-family:
-            Georgia; font-size: 28pt; font-weight: normal;">We Hear You</span>
-        </td>
-        <td style="border-bottom: 1px solid #ddd;">
-             <img src="cid:6fe1efdea357534d238b86e7860a7c5a" width="94"
-             alt="osTicket Logo (kangaroo)" style="width: 94px; float:
-             right; vertical-align: bottom;" height="53">
-        </td>
-    </tr>
-    <tr>
-        <td style="width:67%; padding-top: 12pt; padding-right: 12pt">
-            <p>
-                Dear %{ticket.name},
-            </p>
-            <p>
-                A request for support has been created and assigned ticket
-                <a href="%{ticket.client_link}">#%{ticket.number}</a> with
-                the following automatic reply
-            </p>
-            <p>
-                Topic: <strong>%{ticket.topic.name}</strong>
-            </p>
-            <p>
-                Subject: <strong>%{ticket.subject}</strong>
-            </p>
-            <p>
-                Submitted: <strong>%{ticket.create_date}</strong>
-            </p>
-            <p>
-                %{response}
-            </p>
-            <p>
-                If need be, a representative will follow-up with you as soon
-                as possible. You can <a href="%{ticket.client_link}">view
-                this ticket's progress online</a>.
-            </p>
-            <p>
-                Your Company Name Team,<br>
-                %{signature}
-            </p>
-        </td>
-        <td style="vertical-align: top; padding-top: 12pt;">
-            <p>
-                 <span style="color: rgb(127, 127, 127);">Company Name<br>
-                 %{signature}</span>
-            </p>
-            <p>
-                 <span style="color: rgb(127, 127, 127);">We hope this
-                 response has sufficiently answered your questions. If not,
-                 please do not send another email. Instead, reply to this
-                 email or <a href="%{ticket.client_link}"><span
-                 style="color: rgb(84, 141, 212);">login to your
-                 account</span></a> for a complete archive of all your
-                 support requests and responses.</span>
-            </p>
-            <p>
-                 <span style="color: rgb(127, 127, 127);">Visit our </span>
-                 <a href="%{url}/kb"><span style="color: rgb(84, 141,
-                 212);">knowledgebase</span></a>
-            </p>
-        </td>
-    </tr>
-    </tbody>
-    </table>
+    <p>
+        <span style="color: rgb(127, 127, 127); font-family: Georgia;
+        font-size: 28pt; font-weight: normal;">We Hear You</span><img
+        src="cid:6fe1efdea357534d238b86e7860a7c5a" width="96"
+        alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
+        float: right; margin: 0px 0px 10px 10px;">
+    </p>
+    <p>
+         <strong>Dear %{ticket.name},</strong>
+    </p>
+    <p>
+         A request for support has been created and assigned ticket <a
+         href="%{ticket.client_link}">#%{ticket.number}</a> with the
+         following automatic reply
+    </p>
+    <p>
+         Topic: <strong>%{ticket.topic.name}</strong>
+    </p>
+    <p>
+         Subject: <strong>%{ticket.subject}</strong>
+    </p>
+    <p>
+         %{response}
+    </p>
+    <p>
+         Your Company Name Team,<br>
+         %{signature}
+    </p>
+    <hr>
+    <p>
+        <span style="color: rgb(127, 127, 127);">We hope this response has
+        sufficiently answered your questions. If not, please do not send
+        another email. Instead, reply to this email or <a
+        href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+        >login to your account</span></a> for a complete archive of
+        all your support requests and responses.</span>
+    </p>
     <p style="text-align: center;">
-        <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
-        alt="Powered by osTicket" height="19" style="width: 126px;">
+         <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
+         alt="Powered by osTicket" height="19" style="width: 126px;"/>
     </p>
diff --git a/include/i18n/en_US/templates/email/ticket.autoresp.yaml b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
index 48d1c22941b94564c7a5847b3e45280290d3849d..1f3a11d7f8bd73d1f934df3a7b064075d31658bc 100644
--- a/include/i18n/en_US/templates/email/ticket.autoresp.yaml
+++ b/include/i18n/en_US/templates/email/ticket.autoresp.yaml
@@ -8,7 +8,7 @@ notes: |
     Sent to a user when a new ticket is created
 
 subject: |
-    Support Ticket Opened [#%{ticket.number}]
+    Support Ticket Opened
 body: |
     <table cellspacing="0">
     <tbody>
diff --git a/include/i18n/en_US/templates/email/ticket.notice.yaml b/include/i18n/en_US/templates/email/ticket.notice.yaml
index 3bcf76611a9c50ed5a96999d5f138aa374f5c9cb..6df4af7ac9a0249a1c7b4182e601d3e7aafbb53e 100644
--- a/include/i18n/en_US/templates/email/ticket.notice.yaml
+++ b/include/i18n/en_US/templates/email/ticket.notice.yaml
@@ -13,76 +13,49 @@ notes: |
 subject: |
     %{ticket.subject}
 body: |
-    <table cellspacing="0">
-    <tbody>
-    <tr>
-        <td style="vertical-align: middle; border-bottom: 1px solid #ddd;
-        height: 48pt">
-            <span style="color: rgb(127, 127, 127); font-family: Georgia;
-            font-size: 28pt; font-weight: normal;">We're Here For You</span>
-        </td>
-        <td style="border-bottom: 1px solid #ddd;">
-            <img src="cid:6fe1efdea357534d238b86e7860a7c5a" width="94"
-            alt="osTicket Logo (kangaroo)" style="width: 94px; float: right;
-            vertical-align: bottom;" height="53">
-        </td>
-    </tr>
-    <tr>
-        <td style="width:67%; padding-top: 12pt; padding-right: 12pt">
-            <p>
-                 Dear %{ticket.name},
-            </p>
-            <p>
-                 Our customer care team has created a ticket, <a
-                 href="%{ticket.client_link}">#%{ticket.number}</a> on your
-                 behalf, with the following details and summary.
-            </p>
-            <p>
-                 Topic: <strong>%{ticket.topic.name}</strong>
-            </p>
-            <p>
-                 Subject: <strong>%{ticket.subject}</strong>
-            </p>
-            <p>
-                 Submitted: <strong>%{ticket.create_date}</strong>
-            </p>
-            <p>
-                 %{message}
-            </p>
-            <p>
-                 If need be, representative will follow-up with you as soon
-                 as possible. You can <a href="%{ticket.client_link}">view
-                 this ticket's progress online</a>.
-            </p>
-            <p>
-                  Your Company Name Team,<br>
-                  %{signature}
-            </p>
-        </td>
-        <td style="vertical-align: top; padding-top: 12pt;">
-            <p>
-                <span style="color: rgb(127, 127, 127);">Company Name<br>
-                %{signature}</span>
-            </p>
-            <p>
-                <span style="color: rgb(127, 127, 127);">If you wish to
-                provide additional comments or information regarding the
-                issue, please do not send another email. Instead, reply to
-                this email or <a href="%{ticket.client_link}"><span
-                style="color: rgb(84, 141, 212);">login to your
-                account</span></a> for a complete archive of all your
-                support requests and responses.</span>
-            </p>
-            <p>
-                <span style="color: rgb(127, 127, 127);">Visit our</span> <a
-                href="%{url}/kb"><span style="color: rgb(84, 141,
-                212);">knowledgebase</span></a>
-            </p>
-        </td>
-    </tr>
-    </tbody>
-    </table>
+    <p>
+         <span style="color: rgb(127, 127, 127); font-family: Georgia;
+         font-size: 28pt; font-weight: normal;">We're Here For
+         You</span><img src="cid:6fe1efdea357534d238b86e7860a7c5a"
+         width="96" alt="osTicket Logo (kangaroo)" height="54" style="width: 96px;
+         float: right; margin: 0px 0px 10px 10px;">
+    </p>
+    <p>
+         <strong>Dear %{ticket.name},</strong>
+    </p>
+    <p>
+         Our customer care team has created a ticket, <a
+         href="%{ticket.client_link}">#%{ticket.number}</a> on your behalf,
+         with the following details and summary:
+    </p>
+    <p>
+         Topic: <strong>%{ticket.topic.name}</strong>
+    </p>
+    <p>
+         Subject: <strong>%{ticket.subject}</strong>
+    </p>
+    <p>
+         %{message}
+    </p>
+    <p>
+         If need be, representative will follow-up with you as soon as
+         possible. You can also <a href="%{ticket.client_link}">view this
+         ticket's progress online</a>.
+    </p>
+    <p>
+         Your Company Name Team,<br>
+         %{signature}
+    </p>
+    <hr>
+    <p>
+        <span style="color: rgb(127, 127, 127);">If you wish to provide
+        additional comments or information regarding the issue, please do
+        not send another email. Instead, reply to this email or <a
+        href="%{ticket.client_link}"><span style="color: rgb(84, 141, 212);"
+        >login to your account</span></a> for a complete archive of all your
+        support requests and responses.</span>
+    </p>
     <p style="text-align: center;">
-        <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126" height="19"
-        style="width: 126px;" alt="Powered by osTicket">
+        <img src="cid:b56944cb4722cc5cda9d1e23a3ea7fbc" width="126"
+        alt="Powered by osTicket" height="19" style="width: 126px;">
     </p>