X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/23b8672bc9a8449f6a89d94b25ea036f4815e4bc..408461e5aa9419500a624d62c781d7328e5c2b9d:/script/deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index d3af5ffba..28b32cda6 100755
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
-require 'mailread'
+require 'tmail'
 
 exit 0 unless recipient = ARGV[0].match(/^([cm])-(\d+)-(.*)$/)
 
@@ -10,21 +10,23 @@ if recipient[1] == "c"
   digest = comment.digest
   from = comment.diary_entry.user
   to = comment.user
+  subject = mail.subject
 else
   message = Message.find(recipient[2])
   digest = message.digest
   from = message.recipient
   to = message.sender
+  subject = mail.subject.sub(/\[OpenStreetMap\] */, "")
 end
 
 exit 0 unless recipient[3] == digest[0,6]
 
-mail = Mail.new(STDIN)
+mail = TMail::Mail.parse(STDIN.readlines.join)
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => Time.now.getutc,
-                      :title => mail["Subject"],
-                      :body => mail.body.join("\n"))
+                      :title => subject,
+                      :body => mail.body)
 message.save!
 
 Notifier::deliver_message_notification(message)