diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 45ae2ef752..d89ee695d5 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -55,6 +55,7 @@ import android.text.Editable;
 import android.text.Html;
 import android.text.Layout;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -62,6 +63,7 @@ import android.text.TextWatcher;
 import android.text.format.DateUtils;
 import android.text.method.ArrowKeyMovementMethod;
 import android.text.method.LinkMovementMethod;
+import android.text.style.BackgroundColorSpan;
 import android.text.style.DynamicDrawableSpan;
 import android.text.style.ForegroundColorSpan;
 import android.text.style.ImageSpan;
@@ -69,6 +71,7 @@ import android.text.style.QuoteSpan;
 import android.text.style.URLSpan;
 import android.util.Pair;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -92,6 +95,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.PopupWindow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -956,7 +960,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ivType.setImageResource(icon);
             }
 
-            ivFound.setVisibility(message.ui_found && found ? View.VISIBLE : View.GONE);
+            ivFound.setVisibility(message.ui_found && AdapterMessage.this.found ? View.VISIBLE : View.GONE);
 
             ibSnoozed.setImageResource(
                     message.ui_snoozed != null && message.ui_snoozed == Long.MAX_VALUE
@@ -3338,6 +3342,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             popupMenu.getMenu().findItem(R.id.menu_delete).setEnabled(message.uid == null || !message.folderReadOnly);
             popupMenu.getMenu().findItem(R.id.menu_delete).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
+            popupMenu.getMenu().findItem(R.id.menu_search_in_text).setEnabled(message.content);
+
             popupMenu.getMenu().findItem(R.id.menu_resync).setEnabled(message.uid != null);
             popupMenu.getMenu().findItem(R.id.menu_resync).setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
 
@@ -3394,6 +3400,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         case R.id.menu_resync:
                             onMenuResync(message);
                             return true;
+                        case R.id.menu_search_in_text:
+                            onMenuSearch(message);
+                            return true;
                         case R.id.menu_create_rule:
                             onMenuCreateRule(message);
                             return true;
@@ -3747,6 +3756,106 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             }.execute(context, owner, args, "message:share");
         }
 
+        private int found = 0;
+
+        private void onMenuSearch(TupleMessageEx message) {
+            LayoutInflater inflater = LayoutInflater.from(context);
+            View dview = inflater.inflate(R.layout.popup_search_in_text, null, false);
+            EditText etSearch = dview.findViewById(R.id.etSearch);
+            ImageButton ibNext = dview.findViewById(R.id.ibNext);
+
+            etSearch.setText(null);
+            ibNext.setEnabled(false);
+
+            etSearch.addTextChangedListener(new TextWatcher() {
+                @Override
+                public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+                    // Do nothing
+                }
+
+                @Override
+                public void onTextChanged(CharSequence s, int start, int before, int count) {
+                    found = find(s.toString(), 1);
+                    ibNext.setEnabled(found > 0);
+                }
+
+                @Override
+                public void afterTextChanged(Editable s) {
+                    // Do nothing
+                }
+            });
+
+            ibNext.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    found = find(etSearch.getText().toString(), ++found);
+                }
+            });
+
+            PopupWindow pw = new PopupWindow(dview, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            pw.setFocusable(true);
+            pw.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                @Override
+                public void onDismiss() {
+                    SpannableString ss = new SpannableString(tvBody.getText());
+                    for (BackgroundColorSpan span : ss.getSpans(0, ss.length(), BackgroundColorSpan.class))
+                        ss.removeSpan(span);
+                    tvBody.setText(ss);
+                }
+            });
+            pw.showAtLocation(parentFragment.getView(), Gravity.TOP | Gravity.END, 0, 0);
+        }
+
+        private int find(String query, int result) {
+            query = query.toLowerCase();
+
+            SpannableString ss = new SpannableString(tvBody.getText());
+            for (BackgroundColorSpan span : ss.getSpans(0, ss.length(), BackgroundColorSpan.class))
+                ss.removeSpan(span);
+
+            int p = -1;
+            String text = tvBody.getText().toString().toLowerCase();
+            for (int i = 0; i < result; i++)
+                p = (p < 0 ? text.indexOf(query) : text.indexOf(query, p + 1));
+
+            if (p < 0 && result > 1) {
+                result = 1;
+                p = text.indexOf(query);
+            }
+            if (p < 0)
+                result = 0;
+
+            final int pos = p;
+            if (pos > 0) {
+                int color = Helper.resolveColor(context, R.attr.colorHighlight);
+                ss.setSpan(new BackgroundColorSpan(color), pos, pos + query.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                tvBody.setText(ss);
+
+                final int apos = getAdapterPosition();
+
+                tvBody.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            int line = tvBody.getLayout().getLineForOffset(pos);
+                            int y = Math.round(line * tvBody.getLineHeight());
+
+                            Rect rect = new Rect();
+                            tvBody.getDrawingRect(rect);
+                            ((ViewGroup) view).offsetDescendantRectToMyCoords(tvBody, rect);
+
+                            properties.scrollTo(apos, rect.top + y);
+                        } catch (Throwable ex) {
+                            Log.e(ex);
+                        }
+                    }
+                });
+            } else
+                tvBody.setText(ss, TextView.BufferType.SPANNABLE);
+
+            return result;
+        }
+
         private void onMenuCreateRule(TupleMessageEx message) {
             Intent rule = new Intent(ActivityView.ACTION_EDIT_RULE);
             rule.putExtra("account", message.account);
@@ -4840,6 +4949,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         void scrollTo(int pos);
 
+        void scrollTo(int pos, int y);
+
         void move(long id, String type);
 
         void finish();
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 8fe9ecb35c..c47bf86e8c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1508,6 +1508,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
             });
         }
 
+        public void scrollTo(final int pos, final int y) {
+            new Handler().post(new Runnable() {
+                @Override
+                public void run() {
+                    LinearLayoutManager llm = (LinearLayoutManager) rvMessage.getLayoutManager();
+                    llm.scrollToPositionWithOffset(pos, -y);
+                }
+            });
+        }
+
         @Override
         public void move(long id, String type) {
             Bundle args = new Bundle();
diff --git a/app/src/main/res/layout/popup_search_in_text.xml b/app/src/main/res/layout/popup_search_in_text.xml
new file mode 100644
index 0000000000..acce889a24
--- /dev/null
+++ b/app/src/main/res/layout/popup_search_in_text.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorActionBackground"
+    android:padding="12dp">
+
+    <EditText
+        android:id="@+id/etSearch"
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:text="Search"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <requestFocus />
+    </EditText>
+
+    <ImageButton
+        android:id="@+id/ibNext"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        app:layout_constraintBottom_toBottomOf="@id/etSearch"
+        app:layout_constraintStart_toEndOf="@+id/etSearch"
+        app:layout_constraintTop_toTopOf="@+id/etSearch"
+        app:srcCompat="@drawable/baseline_fast_forward_24" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/popup_message_more.xml b/app/src/main/res/menu/popup_message_more.xml
index c26452342b..26b28dfce1 100644
--- a/app/src/main/res/menu/popup_message_more.xml
+++ b/app/src/main/res/menu/popup_message_more.xml
@@ -44,6 +44,10 @@
         android:id="@+id/menu_resync"
         android:title="@string/title_resync" />
 
+    <item
+        android:id="@+id/menu_search_in_text"
+        android:title="@string/title_search_in_text" />
+
     <item
         android:id="@+id/menu_create_rule"
         android:title="@string/title_create_rule" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dd778f3f92..e186c151d1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,6 +10,9 @@
     <!-- White 87%  primary_text_default_material_dark -->
     <color name="colorUnreadDark">#ffffffff</color>
 
+    <color name="colorHighlightLight">#ffffe000</color>
+    <color name="colorHighlightDark">#ffffff00</color>
+
     <color name="colorEncryptLight">#ff00ff00</color>
     <color name="colorEncryptDark">#ff00e000</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index bd3058e71a..43e1aed222 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <attr name="colorRead" format="reference" />
     <attr name="colorUnread" format="reference" />
     <attr name="colorUnreadHighlight" format="reference" />
+    <attr name="colorHighlight" format="reference" />
     <attr name="colorEncrypt" format="reference" />
     <attr name="colorSeparator" format="reference" />
     <attr name="colorWarning" format="reference" />
@@ -26,6 +27,8 @@
         <item name="colorRead">@color/colorReadLight</item>
         <item name="colorUnread">@color/colorUnreadLight</item>
 
+        <item name="colorHighlight">@color/colorHighlightLight</item>
+
         <item name="colorEncrypt">@color/colorEncryptLight</item>
 
         <item name="colorSeparator">@color/lightColorSeparator</item>
@@ -66,6 +69,8 @@
         <item name="colorRead">@color/colorReadDark</item>
         <item name="colorUnread">@color/colorUnreadDark</item>
 
+        <item name="colorHighlight">@color/colorHighlightDark</item>
+
         <item name="colorEncrypt">@color/colorEncryptDark</item>
 
         <item name="colorSeparator">@color/darkColorSeparator</item>