Merge branch 'release/0.7'0.7.00.7

1 files changed, 7 insertions, 0 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index 6fc0ff3cc..f53a5856a 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -148,6 +148,13 @@ describe IncomingMessage, " folding quoted parts of emails" do
         @incoming_message.remove_lotus_quoting(text).should match(/FOLDED_QUOTED_SECTION/)
     end
 
+    it 'should not error when trying to fold lotus notes quoted parts on a request with no user_name' do
+        text = "hello"
+        @incoming_message = IncomingMessage.new()
+        @incoming_message.stub_chain(:info_request, :user_name).and_return(nil)
+        @incoming_message.remove_lotus_quoting(text).should == 'hello'
+    end
+
     it "cope with [ in user names properly" do
         @incoming_message = IncomingMessage.new()
         @incoming_message.stub_chain(:info_request, :user_name).and_return("Sir [ Bobble")