1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SearchActivity.java b/src/main/java/de/pixart/messenger/ui/SearchActivity.java
index 54c5ef5e4..7c43bf37c 100644
--- a/src/main/java/de/pixart/messenger/ui/SearchActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SearchActivity.java
@@ -204,6 +204,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc
         } else {
             MessageSearchTask.cancelRunningTasks();
             this.messages.clear();
+            messageListAdapter.setHighlightedTerm(null);
             messageListAdapter.notifyDataSetChanged();
             changeBackground(false, false);
         }
@@ -213,6 +214,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc
     public void onSearchResultsAvailable(String term, List<Message> messages) {
         runOnUiThread(() -> {
             this.messages.clear();
+            messageListAdapter.setHighlightedTerm(term);
             DateSeparator.addAll(messages);
             this.messages.addAll(messages);
             messageListAdapter.notifyDataSetChanged();