diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4d53bcc..8cb579c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -71,6 +71,11 @@
     <string name="add_one_recipient">Add at least one recipient.</string>
     <string name="email_queued_for_sending">Email queued for sending</string>
 
+    <string name="response_prefix_re">Re:</string>
+    <string name="response_prefix_re_hide" translatable="false">Re:</string>
+    <string name="response_quote_wrote">%s wrote:</string>
+    <string name="response_quote_wrote_hide" translatable="false">%s wrote:</string>
+
     <string name="address_book_empty">Address book is empty</string>
     <string name="action_new_contact">New contact</string>
 
diff --git a/src/i2p/bote/android/NewEmailFragment.java b/src/i2p/bote/android/NewEmailFragment.java
index cf6ccc3..22e524a 100644
--- a/src/i2p/bote/android/NewEmailFragment.java
+++ b/src/i2p/bote/android/NewEmailFragment.java
@@ -108,6 +108,9 @@ public class NewEmailFragment extends Fragment {
         String quoteMsgId = getArguments().getString(QUOTE_MSG_ID);
         Email origEmail = null;
         String recipientAddr = null;
+        String origSubject = null;
+        String origContent = null;
+        String origFrom = null;
         try {
             origEmail = BoteHelper.getEmail(quoteMsgFolder, quoteMsgId);
             if (origEmail != null) {
@@ -115,6 +118,9 @@ public class NewEmailFragment extends Fragment {
                         BoteHelper.getOneLocalRecipient(origEmail).toString());
                 recipientAddr = BoteHelper.getNameAndDestination(
                         origEmail.getReplyAddress(I2PBote.getInstance().getIdentities()));
+                origSubject = origEmail.getSubject();
+                origContent = origEmail.getText();
+                origFrom = BoteHelper.getShortSenderName(origEmail.getOneFromAddress(), 50);
             }
         } catch (PasswordException e) {
             // TODO Auto-generated catch block
@@ -168,6 +174,27 @@ public class NewEmailFragment extends Fragment {
 
         mSubject = (EditText) view.findViewById(R.id.subject);
         mContent = (EditText) view.findViewById(R.id.message);
+        boolean hide = I2PBote.getInstance().getConfiguration().getHideLocale();
+        if (origSubject != null) {
+            String responsePrefix = getResources().getString(
+                    hide ? R.string.response_prefix_re_hide
+                         : R.string.response_prefix_re);
+            if (!origSubject.startsWith(responsePrefix))
+                origSubject = responsePrefix + " " + origSubject;
+            mSubject.setText(origSubject);
+        }
+        if (origContent != null) {
+            StringBuilder quotation = new StringBuilder();
+            quotation.append("\n\n");
+            quotation.append(getResources().getString(
+                    hide ? R.string.response_quote_wrote
+                         : R.string.response_quote_wrote_hide,
+                            origFrom));
+            String[] lines = origContent.split("\r?\n|\r");
+            for (String line: lines)
+                quotation = quotation.append("\n> ").append(line);
+            mContent.setText(quotation);
+        }
 
         if (savedInstanceState == null) {
             mRecipients.setPrefix(getResources().getString(R.string.email_to) + " ");