split_node_tags: Merge changes from main branch.

diff --cc app/controllers/message_controller.rb
index 9dc1d69229348291b9da97d5d9a7bd724c7ad210,8aecef98e56a87059595550c72064170fca66501..395d56028999d92a99a70e4b20d020942aa0d1d9
--- 1/app/controllers/message_controller.rb
--- 2/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@@ -20,10 -20,24 +20,22 @@@ class MessageController < ApplicationCo
      end
    end
  
+   def destroy
+     @message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
+     if !@message.message_read
+       flash[:notice] = 'Message not read and so not deleted'
+       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+     else
+       flash[:notice] = "Message '#{@message.title}' deleted"
+       @message.destroy
+       redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+     end
+   end
+ 
    def reply
      message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
 -    @body = "\n\nOn #{message.sent_on} #{message.sender.display_name} wrote:\n #{message.body}" 
 -    @title = "Re: #{message.title}"
 -    @user_id = message.from_user_id
 -    render :action => 'new'
 +    title = message.title.sub(/^Re:\s*/, "Re: ")
 +    redirect_to :action => 'new', :user_id => message.from_user_id, :title => title
    rescue ActiveRecord::RecordNotFound
      render :nothing => true, :status => :not_found
    end