X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a52242ccbccaea7193f3f9368d5d7317ff142397..25b93471c1861b77190f15dac17b526619710858:/app/controllers/message_controller.rb

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index 38c9b2f3d..fd638e4e7 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -29,6 +29,7 @@ class MessageController < ApplicationController
         end
       end
     else
+      @message = Message.new(:recipient => @this_user)
       @title = t 'message.new.title'
     end
   end
@@ -40,9 +41,13 @@ class MessageController < ApplicationController
     if message.to_user_id == @user.id then
       message.update_attribute(:message_read, true)
 
-      @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"
-      @title = @subject = "Re: #{message.title.sub(/^Re:\s*/, '')}"
-      @this_user = User.find(message.from_user_id)
+      @message = Message.new(
+        :recipient => message.sender,
+        :title => "Re: #{message.title.sub(/^Re:\s*/, '')}",
+        :body => "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}",
+      )
+
+      @title = @message.title
 
       render :action => 'new'
     else