Fix: Line returns in email sending in lib/email

overlookmotel · Sep 12, 2016 · 800bdaf · 800bdaf
1 parent 64f16d2
commit 800bdaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -630,3 +630,4 @@ No changes. Erroneous version bump.
 
 * Load front end components from npm/git and build script
 * Update front end components to latest
+* Fix: Line returns in email sending in `lib/email`
diff --git a/lib/email.js b/lib/email.js
@@ -61,7 +61,7 @@ _.extend(Mailer.prototype, {
 		}
 
 		// make all line returns \r\n
-		message.text = message.text.replace(/\n/g, '\r\n').replace(/\r\r/g, '\r');
+		message.text = message.text.replace(/\r\n/g, '\n').replace(/\r/g, '\n').replace(/\n/g, '\r\n');
 
 		// compile message in mandrill format
 		message.from_email = message.from.email; // jshint ignore:line