From 5078ecbef1ff86cb7553c514452950d8bca79fb1 Mon Sep 17 00:00:00 2001
From: CommName <CommName@users.noreply.github.com>
Date: Sat, 21 Sep 2019 22:19:03 +0200
Subject: [PATCH 1/2] Highlight bug fix

---
 src/widgets/helper/ChannelView.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index d9dc36a64..d80376a7b 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -582,6 +582,11 @@ void ChannelView::setChannel(ChannelPtr channel)
         this->lastMessageHasAlternateBackground_ =
             !this->lastMessageHasAlternateBackground_;
 
+        if (channel->shouldIgnoreHighlights())
+        {
+                    messageLayout->flags.set(MessageLayoutFlag::IgnoreHighlights);
+        }
+
         this->messages_.pushBack(MessageLayoutPtr(messageLayout), deleted);
         this->scrollBar_->addHighlight(snapshot[i]->getScrollBarHighlight());
     }

From 1256a7b631a7eda0f38828402871d636170beb6f Mon Sep 17 00:00:00 2001
From: pajlada <rasmus.karlsson@pajlada.com>
Date: Sun, 22 Sep 2019 10:42:22 +0200
Subject: [PATCH 2/2] Fix formatting

---
 src/widgets/helper/ChannelView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index d80376a7b..e10d670ee 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -584,7 +584,7 @@ void ChannelView::setChannel(ChannelPtr channel)
 
         if (channel->shouldIgnoreHighlights())
         {
-                    messageLayout->flags.set(MessageLayoutFlag::IgnoreHighlights);
+            messageLayout->flags.set(MessageLayoutFlag::IgnoreHighlights);
         }
 
         this->messages_.pushBack(MessageLayoutPtr(messageLayout), deleted);