diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 93dd3df439..c1cd14bd30 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -973,7 +973,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                     .show();
         }
 
-        private void onForward(final ActionData data) {
+        private void onForward(final ActionData data, final boolean raw) {
             Bundle args = new Bundle();
             args.putLong("id", data.message.id);
 
@@ -992,7 +992,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 protected void onLoaded(Bundle args, Boolean available) {
                     final Intent forward = new Intent(context, ActivityCompose.class)
                             .putExtra("action", "forward")
-                            .putExtra("reference", data.message.id);
+                            .putExtra("reference", data.message.id)
+                            .putExtra("raw", raw);
                     if (available)
                         context.startActivity(forward);
                     else
@@ -1193,6 +1194,9 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             popupMenu.getMenu().findItem(R.id.menu_forward).setEnabled(data.message.content);
             popupMenu.getMenu().findItem(R.id.menu_forward).setVisible(!inOutbox);
 
+            popupMenu.getMenu().findItem(R.id.menu_forward_raw).setVisible(
+                    data.message.content && data.message.headers != null && !inOutbox);
+
             popupMenu.getMenu().findItem(R.id.menu_reply_all).setEnabled(data.message.content);
             popupMenu.getMenu().findItem(R.id.menu_reply_all).setVisible(!inOutbox);
 
@@ -1217,7 +1221,10 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                             onJunk(data);
                             return true;
                         case R.id.menu_forward:
-                            onForward(data);
+                            onForward(data, false);
+                            return true;
+                        case R.id.menu_forward_raw:
+                            onForward(data, true);
                             return true;
                         case R.id.menu_reply_all:
                             onReplyAll(data);
diff --git a/app/src/main/java/eu/faircode/email/EntityAttachment.java b/app/src/main/java/eu/faircode/email/EntityAttachment.java
index 004981cb97..7ecbe3f421 100644
--- a/app/src/main/java/eu/faircode/email/EntityAttachment.java
+++ b/app/src/main/java/eu/faircode/email/EntityAttachment.java
@@ -23,8 +23,10 @@ import android.content.Context;
 import android.util.Log;
 
 import java.io.BufferedOutputStream;
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -81,6 +83,22 @@ public class EntityAttachment {
         return new File(dir, Long.toString(id));
     }
 
+    void write(Context context, String body) throws IOException {
+        File file = getFile(context, id);
+        BufferedWriter out = null;
+        try {
+            out = new BufferedWriter(new FileWriter(file));
+            out.write(body == null ? "" : body);
+        } finally {
+            if (out != null)
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    Log.e(Helper.TAG, e + "\n" + Log.getStackTraceString(e));
+                }
+        }
+    }
+
     void download(Context context, DB db) throws MessagingException, IOException {
         // Build filename
         File file = EntityAttachment.getFile(context, this.id);
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index cef6177c70..f73c2bc061 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -388,6 +388,7 @@ public class FragmentCompose extends FragmentEx {
                 args.putLong("id", getArguments().getLong("id", -1));
                 args.putLong("account", getArguments().getLong("account", -1));
                 args.putLong("reference", getArguments().getLong("reference", -1));
+                args.putBoolean("raw", getArguments().getBoolean("raw", false));
                 args.putLong("answer", getArguments().getLong("answer", -1));
                 args.putString("to", getArguments().getString("to"));
                 args.putString("cc", getArguments().getString("cc"));
@@ -1002,6 +1003,7 @@ public class FragmentCompose extends FragmentEx {
             String action = args.getString("action");
             long id = args.getLong("id", -1);
             long reference = args.getLong("reference", -1);
+            boolean raw = args.getBoolean("raw", false);
             long answer = args.getLong("answer", -1);
             boolean pro = Helper.isPro(getContext());
 
@@ -1225,6 +1227,30 @@ public class FragmentCompose extends FragmentEx {
                             File target = EntityAttachment.getFile(context, copy.id);
                             Helper.copy(source, target);
                         }
+
+                    if (raw) {
+                        EntityAttachment headers = new EntityAttachment();
+                        headers.message = result.draft.id;
+                        headers.sequence = ++sequence;
+                        headers.name = "headers.txt";
+                        headers.type = "text/plan";
+                        headers.available = true;
+                        headers.id = db.attachment().insertAttachment(headers);
+
+                        headers.write(context, ref.headers);
+
+                        EntityAttachment content = new EntityAttachment();
+                        content.message = result.draft.id;
+                        content.sequence = ++sequence;
+                        content.name = "content.html";
+                        content.type = "text/html";
+                        content.available = true;
+                        content.id = db.attachment().insertAttachment(content);
+
+                        File csource = EntityMessage.getFile(context, ref.id);
+                        File ctarget = EntityAttachment.getFile(context, content.id);
+                        Helper.copy(csource, ctarget);
+                    }
                 }
 
                 EntityOperation.queue(db, result.draft, EntityOperation.ADD);
diff --git a/app/src/main/res/menu/menu_message.xml b/app/src/main/res/menu/menu_message.xml
index c63aa0b6c3..933a023f32 100644
--- a/app/src/main/res/menu/menu_message.xml
+++ b/app/src/main/res/menu/menu_message.xml
@@ -8,6 +8,10 @@
         android:id="@+id/menu_forward"
         android:title="@string/title_forward" />
 
+    <item
+        android:id="@+id/menu_forward_raw"
+        android:title="@string/title_forward_raw" />
+
     <item
         android:id="@+id/menu_reply_all"
         android:title="@string/title_reply_all" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1d056c996e..6840b7aa20 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -201,6 +201,7 @@
     <string name="title_flag">Add star</string>
     <string name="title_unflag">Remove star</string>
     <string name="title_forward">Forward</string>
+    <string name="title_forward_raw">Forward raw</string>
     <string name="title_reply_all">Reply to all</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_show_html">Show original</string>