From e844f4ab0c5fa6cb92a14ace0156a381983a1726 Mon Sep 17 00:00:00 2001
From: Bao-Long Nguyen-Trong <baolongnt@gmail.com>
Date: Sun, 10 May 2009 05:39:47 +0000
Subject: [PATCH] Fixed issue 191

---
 .../android/email/activity/MessageCompose.java  | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/com/android/email/activity/MessageCompose.java b/src/com/android/email/activity/MessageCompose.java
index f365ab35e..8c3ae59d5 100644
--- a/src/com/android/email/activity/MessageCompose.java
+++ b/src/com/android/email/activity/MessageCompose.java
@@ -597,7 +597,10 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
          */
 
         String text = mMessageContentView.getText().toString();
-
+        if (!this.mSourceMessageProcessed) {
+            text = appendSignature(text);
+        }
+        
         if (mQuotedTextBar.getVisibility() == View.VISIBLE) {
             String action = getIntent().getAction();
             String quotedText = null;
@@ -629,10 +632,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
             }
         }
 
-        if (!mSourceMessageProcessed) {
-            text = appendSignature(text);
-        }
-
         TextBody body = new TextBody(text);
 
         if (mAttachments.getChildCount() > 0) {
@@ -673,12 +672,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
         return message;
     }
 
-    private String appendSignature (String text) {
+    private String appendSignature(String text) {
         String mSignature;
         mSignature = mAccount.getSignature();
-        
-       if (mSignature != null && ! mSignature.contentEquals("")){
-         text += "\n-- \n" + mAccount.getSignature();
+
+        if (mSignature != null && !mSignature.contentEquals("")) {
+            text += "\n-----\n" + mAccount.getSignature();
         }
 
         return text;