--- mail_handler.rb.orig	(original file)
+++ mail_handler.rb	        (working copy)
@@ -119,12 +119,12 @@
   # Creates a new forum message
   def receive_forum_message
     project = target_project
-    board = target_board
+    board = target_board(project)
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:edit_messages, project)
     message = Message.new(:author => user, :board => board)
     message.subject = email.subject.split(FORUM_MESSAGE_SUBJECT_SPLIT)[6].strip
-    message.content = email.plain_text_body.chomp
+    message.content = plain_text_body.chomp
     message.save!
     logger.info "MailHandler: message ##{message.id} - #{message.subject} created by #{user}" if logger && logger.info
     #Mailer.deliver_message_posted(message) if Setting.notified_events.include?('message_posted')
@@ -134,7 +134,7 @@
   # Creates a reply to an existing forum message
   def receive_forum_message_reply
     project = target_project
-    board = target_board
+    board = target_board(project)
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:edit_messages, project)
     message = Message.new(:author => user, :board => board)
@@ -144,7 +144,8 @@
                                      board, subject ],
                                      :order => "created_on DESC").id
     message.subject = "Re: " + subject
-    message.content = email.plain_text_body.chomp
+    # message.content = email.plain_text_body.chomp
+    message.content = plain_text_body.chomp
     message.save!
     logger.info "MailHandler: message ##{message.id} - #{message.subject} created by #{user} in reply to message ##{message.parent_id}" if logger && logger.info
     #Mailer.deliver_message_posted(message) if Setting.notified_events.include?('message_posted')
@@ -162,8 +163,10 @@
     target
   end
   
-  def target_board
-    target = Board.find_by_name(email.subject.split(FORUM_MESSAGE_SUBJECT_SPLIT)[4].strip)
+  def target_board(project)
+    target =  Board.find(:first,
+                         :conditions => [ "project_id = ? AND name = ?",
+                         project.id, email.subject.split(FORUM_MESSAGE_SUBJECT_SPLIT)[4].strip ])
     raise MissingInformation.new('Unable to determine target board/forum') if target.nil?
     target
   end