diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index cfb9126cff..36d7bf4da0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -64,10 +64,12 @@ import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.google.android.material.snackbar.Snackbar;
 
+import org.jsoup.Jsoup;
 import org.xml.sax.XMLReader;
 
 import java.io.IOException;
@@ -1294,6 +1296,59 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }.execute(context, owner, args);
         }
 
+        private void onShare(ActionData data) {
+            Bundle args = new Bundle();
+            args.putLong("id", data.message.id);
+
+            new SimpleTask<String>() {
+                @Override
+                protected String onExecute(Context context, Bundle args) throws Throwable {
+                    long id = args.getLong("id");
+
+                    DB db = DB.getInstance(context);
+                    EntityMessage message = db.message().getMessage(id);
+
+                    StringBuilder sb = new StringBuilder();
+                    sb.append(context.getString(R.string.title_from))
+                            .append(' ')
+                            .append(MessageHelper.getFormattedAddresses(message.from, true))
+                            .append("\r\n");
+
+                    if (message.subject != null) {
+                        sb.append(context.getString(R.string.title_subject))
+                                .append(' ')
+                                .append(message.subject)
+                                .append("\r\n");
+                    }
+
+                    sb.append("\r\n");
+                    sb.append(Jsoup.parse(message.read(context)).text());
+
+                    return sb.toString();
+                }
+
+                @Override
+                protected void onExecuted(Bundle args, String text) {
+                    Intent share = new Intent();
+                    share.setAction(Intent.ACTION_SEND);
+                    share.putExtra(Intent.EXTRA_TEXT, text);
+                    share.setType("text/plain");
+
+                    PackageManager pm = context.getPackageManager();
+                    if (share.resolveActivity(pm) == null)
+                        Toast.makeText(context, R.string.title_no_viewer, Toast.LENGTH_LONG).show();
+                    else
+                        context.startActivity(share);
+                }
+
+                @Override
+                protected void onException(Bundle args, Throwable ex) {
+
+                }
+            }.execute(context, owner, args);
+
+        }
+
         private void onShowHeaders(ActionData data) {
             boolean show_headers = !properties.getValue("headers", data.message.id);
             properties.setValue("headers", data.message.id, show_headers);
@@ -1493,6 +1548,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             popupMenu.getMenu().findItem(R.id.menu_unseen).setVisible(data.message.uid != null);
 
+            popupMenu.getMenu().findItem(R.id.menu_show_headers).setEnabled(data.message.content);
+
             popupMenu.getMenu().findItem(R.id.menu_show_headers).setChecked(show_headers);
             popupMenu.getMenu().findItem(R.id.menu_show_headers).setVisible(data.message.uid != null);
 
@@ -1523,6 +1580,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         case R.id.menu_unseen:
                             onUnseen(data);
                             return true;
+                        case R.id.menu_share:
+                            onShare(data);
+                            return true;
                         case R.id.menu_show_headers:
                             onShowHeaders(data);
                             return true;
diff --git a/app/src/main/res/menu/menu_message.xml b/app/src/main/res/menu/menu_message.xml
index de2213fd59..9b24c65790 100644
--- a/app/src/main/res/menu/menu_message.xml
+++ b/app/src/main/res/menu/menu_message.xml
@@ -24,6 +24,10 @@
         android:id="@+id/menu_unseen"
         android:title="@string/title_unseen" />
 
+    <item
+        android:id="@+id/menu_share"
+        android:title="@string/title_share" />
+
     <item
         android:id="@+id/menu_show_headers"
         android:checkable="true"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 567baae0fb..4d532a8c8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -259,6 +259,7 @@
     <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_share">Share</string>
     <string name="title_show_headers">Show headers</string>
     <string name="title_manage_keywords">Manage keywords</string>
     <string name="title_add_keyword">Add keyword</string>