Use either the HTML or the text part of an email, not both

diff --git a/script/deliver-message b/script/deliver-message
index f28a9d9f3b82e0a58e97cfc3f1bcc32da563ff88..7b5f60e01354756a6b4401dd4fb783fa1fd95824 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -19,11 +19,12 @@ end
 exit 0 unless recipient[3] == digest[0,6]
 
 mail = Mail.new(STDIN.readlines.join)
+body = mail.html_part || mail.text_part
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => mail.date.new_offset(0),
                       :title => mail.subject.sub(/\[OpenStreetMap\] */, ""),
-                      :body => mail.body.decoded)
+                      :body => body.decoded)
 message.save!
 
 Notifier.message_notification(message).deliver