From c7762fed23c186436807ef11fbd8a2def9acbfa6 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Jan 2018 00:27:01 +0000
Subject: [PATCH] Normalise newlines in incoming emails

Fixes #1708
---
 script/deliver-message | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/deliver-message b/script/deliver-message
index 46f9642e7..15a9fbdc7 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -25,7 +25,9 @@ exit 0 if date < 1.month.ago
 
 message.update(:message_read => true) if message
 
-mail = Mail.new(STDIN.readlines.join)
+mail = Mail.new(STDIN.read
+                     .encode(:universal_newline => true)
+                     .encode(:crlf_newline => true))
 
 message = Message.from_mail(mail, from, to)
 message.save!
-- 
2.43.2