Merge branch 'hotfix/0.21.0.23' into rails-3-develop

2 files changed, 3 insertions, 6 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 7f6b358db..57a8fd7e0 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -803,11 +803,8 @@ public
 
     # Text from the the initial request, for use in summary display
     def initial_request_text
-        if outgoing_messages.empty? # mainly for use with incomplete fixtures
-            return ""
-        end
-        excerpt = self.outgoing_messages[0].get_text_for_indexing
-        return excerpt
+        return '' if outgoing_messages.empty? # mainly for use with incomplete fixtures
+        outgoing_messages.first.get_text_for_indexing
     end
 
     # Returns index of last event which is described or nil if none described.
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index fa83c7381..c2c8ef4f2 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -302,7 +302,7 @@ class OutgoingMessage < ActiveRecord::Base
     end
 
     def set_default_letter
-        self.body = get_default_message if body.nil?
+        self.body = get_default_message if raw_body.nil?
     end
 
     def format_of_body