diff --git a/src/common/Channel.hpp b/src/common/Channel.hpp
index 8d6ef6557..ef8437ea3 100644
--- a/src/common/Channel.hpp
+++ b/src/common/Channel.hpp
@@ -16,7 +16,7 @@ namespace chatterino {
 
 struct Message;
 using MessagePtr = std::shared_ptr<const Message>;
-enum class MessageFlag : uint32_t;
+enum class MessageFlag : int64_t;
 using MessageFlags = FlagsEnum<MessageFlag>;
 
 enum class TimeoutStackStyle : int {
diff --git a/src/messages/Message.hpp b/src/messages/Message.hpp
index 8097f9f24..6c7a75900 100644
--- a/src/messages/Message.hpp
+++ b/src/messages/Message.hpp
@@ -15,34 +15,34 @@ namespace chatterino {
 class MessageElement;
 class MessageThread;
 
-enum class MessageFlag : uint32_t {
-    None = 0,
-    System = (1 << 0),
-    Timeout = (1 << 1),
-    Highlighted = (1 << 2),
-    DoNotTriggerNotification = (1 << 3),  // disable notification sound
-    Centered = (1 << 4),
-    Disabled = (1 << 5),
-    DisableCompactEmotes = (1 << 6),
-    Collapsed = (1 << 7),
-    ConnectedMessage = (1 << 8),
-    DisconnectedMessage = (1 << 9),
-    Untimeout = (1 << 10),
-    PubSub = (1 << 11),
-    Subscription = (1 << 12),
-    DoNotLog = (1 << 13),
-    AutoMod = (1 << 14),
-    RecentMessage = (1 << 15),
-    Whisper = (1 << 16),
-    HighlightedWhisper = (1 << 17),
-    Debug = (1 << 18),
-    Similar = (1 << 19),
-    RedeemedHighlight = (1 << 20),
-    RedeemedChannelPointReward = (1 << 21),
-    ShowInMentions = (1 << 22),
-    FirstMessage = (1 << 23),
-    ReplyMessage = (1 << 24),
-    ElevatedMessage = (1 << 25),
+enum class MessageFlag : int64_t {
+    None = 0LL,
+    System = (1LL << 0),
+    Timeout = (1LL << 1),
+    Highlighted = (1LL << 2),
+    DoNotTriggerNotification = (1LL << 3),  // disable notification sound
+    Centered = (1LL << 4),
+    Disabled = (1LL << 5),
+    DisableCompactEmotes = (1LL << 6),
+    Collapsed = (1LL << 7),
+    ConnectedMessage = (1LL << 8),
+    DisconnectedMessage = (1LL << 9),
+    Untimeout = (1LL << 10),
+    PubSub = (1LL << 11),
+    Subscription = (1LL << 12),
+    DoNotLog = (1LL << 13),
+    AutoMod = (1LL << 14),
+    RecentMessage = (1LL << 15),
+    Whisper = (1LL << 16),
+    HighlightedWhisper = (1LL << 17),
+    Debug = (1LL << 18),
+    Similar = (1LL << 19),
+    RedeemedHighlight = (1LL << 20),
+    RedeemedChannelPointReward = (1LL << 21),
+    ShowInMentions = (1LL << 22),
+    FirstMessage = (1LL << 23),
+    ReplyMessage = (1LL << 24),
+    ElevatedMessage = (1LL << 25),
 };
 using MessageFlags = FlagsEnum<MessageFlag>;
 
diff --git a/src/messages/layouts/MessageLayoutContainer.hpp b/src/messages/layouts/MessageLayoutContainer.hpp
index 26daba24f..b70ab9ec1 100644
--- a/src/messages/layouts/MessageLayoutContainer.hpp
+++ b/src/messages/layouts/MessageLayoutContainer.hpp
@@ -14,7 +14,7 @@ class QPainter;
 
 namespace chatterino {
 
-enum class MessageFlag : uint32_t;
+enum class MessageFlag : int64_t;
 using MessageFlags = FlagsEnum<MessageFlag>;
 
 struct Margin {
diff --git a/src/widgets/helper/ChannelView.hpp b/src/widgets/helper/ChannelView.hpp
index 123e5cc7c..8e5bfa536 100644
--- a/src/widgets/helper/ChannelView.hpp
+++ b/src/widgets/helper/ChannelView.hpp
@@ -27,7 +27,7 @@ using ChannelPtr = std::shared_ptr<Channel>;
 struct Message;
 using MessagePtr = std::shared_ptr<const Message>;
 
-enum class MessageFlag : uint32_t;
+enum class MessageFlag : int64_t;
 using MessageFlags = FlagsEnum<MessageFlag>;
 
 class MessageLayout;