1 files changed, 10 insertions, 8 deletions
diff --git a/routes/email.js b/routes/email.js
index a274a7b1..14e51bcb 100644
--- a/routes/email.js
+++ b/routes/email.js
@@ -31,20 +31,22 @@ export default {
           new SendEmailCommand({
             Destination: {
               CcAddresses: [],
-              ToAddresses: [config.support],
+              ToAddresses: [config.support]
             },
             Message: {
               Body: {
-                Html: {
-                  Charset,
-                  Data: `${username}<br><br>${message.replace(/\n/g, "<br>")}`
-                },
-                Text: { Charset, Data: `${username}\n\n${message}` }
+                Html: { Charset, Data: message.replace(/\n/g, "<br>") },
+                Text: { Charset, Data: message }
               },
-              Subject: { Charset, Data: body.subject || "Support Request" }
+              Subject: {
+                Charset,
+                Data:
+                  body.subject ||
+                  "Support Request" + (username ? " From " + username : "")
+              }
             },
             ReplyToAddresses: [email],
-              Source: config.support
+            Source: config.support
           })
         );