diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 12a222442..89a1e9d6e 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2721,9 +2721,10 @@ inputBackgroundRemote background_id:int64 = InputBackground;
 //@description Describes theme settings
 //@accent_color Theme accent color in ARGB format
 //@background The background to be used in chats; may be null
-//@message_fill The fill to be used as a background for outgoing messages
-//@animate_message_fill If true, the freeform gradient fill needs to be animated on every sent message
-themeSettings accent_color:int32 background:background message_fill:BackgroundFill animate_message_fill:Bool = ThemeSettings;
+//@outgoing_message_fill The fill to be used as a background for outgoing messages
+//@animate_outgoing_message_fill If true, the freeform gradient fill needs to be animated on every sent message
+//@outgoing_message_accent_color Accent color of outgoing messages in ARGB format
+themeSettings accent_color:int32 background:background outgoing_message_fill:BackgroundFill animate_outgoing_message_fill:Bool outgoing_message_accent_color:int32 = ThemeSettings;
 
 
 //@description Describes a chat theme
diff --git a/td/telegram/ThemeManager.cpp b/td/telegram/ThemeManager.cpp
index 1f7ef974f..786febe2d 100644
--- a/td/telegram/ThemeManager.cpp
+++ b/td/telegram/ThemeManager.cpp
@@ -47,9 +47,10 @@ class GetChatThemesQuery final : public Td::ResultHandler {
 };
 
 bool operator==(const ThemeManager::ThemeSettings &lhs, const ThemeManager::ThemeSettings &rhs) {
-  return lhs.accent_color == rhs.accent_color && lhs.background_id == rhs.background_id &&
-         lhs.background_type == rhs.background_type && lhs.base_theme == rhs.base_theme &&
-         lhs.message_colors == rhs.message_colors && lhs.animate_message_colors == rhs.animate_message_colors;
+  return lhs.accent_color == rhs.accent_color && lhs.message_accent_color == rhs.message_accent_color &&
+         lhs.background_id == rhs.background_id && lhs.background_type == rhs.background_type &&
+         lhs.base_theme == rhs.base_theme && lhs.message_colors == rhs.message_colors &&
+         lhs.animate_message_colors == rhs.animate_message_colors;
 }
 
 bool operator!=(const ThemeManager::ThemeSettings &lhs, const ThemeManager::ThemeSettings &rhs) {
@@ -99,6 +100,9 @@ void ThemeManager::on_update_theme(telegram_api::object_ptr<telegram_api::theme>
   for (auto &chat_theme : chat_themes_.themes) {
     if (chat_theme.light_id == theme->id_ || chat_theme.dark_id == theme->id_) {
       auto theme_settings = get_chat_theme_settings(std::move(theme->settings_));
+      if (theme_settings.message_colors.empty()) {
+        break;
+      }
       if (chat_theme.light_id == theme->id_ && chat_theme.light_theme != theme_settings) {
         chat_theme.light_theme = theme_settings;
         is_changed = true;
@@ -131,7 +135,7 @@ td_api::object_ptr<td_api::themeSettings> ThemeManager::get_theme_settings_objec
   return td_api::make_object<td_api::themeSettings>(
       settings.accent_color,
       td_->background_manager_->get_background_object(settings.background_id, false, &settings.background_type),
-      std::move(fill), settings.animate_message_colors);
+      std::move(fill), settings.animate_message_colors, settings.message_accent_color);
 }
 
 td_api::object_ptr<td_api::chatTheme> ThemeManager::get_chat_theme_object(const ChatTheme &theme) const {
@@ -215,6 +219,8 @@ ThemeManager::ThemeSettings ThemeManager::get_chat_theme_settings(
         td_->background_manager_->on_get_background(BackgroundId(), string(), std::move(settings->wallpaper_), false);
 
     result.accent_color = settings->accent_color_;
+    bool has_outbox_accent_color = (settings->flags_ & telegram_api::themeSettings::OUTBOX_ACCENT_COLOR_MASK) != 0;
+    result.message_accent_color = (has_outbox_accent_color ? settings->outbox_accent_color_ : result.accent_color);
     result.background_id = background.first;
     result.background_type = std::move(background.second);
     result.base_theme = get_base_theme(settings->base_theme_);
diff --git a/td/telegram/ThemeManager.h b/td/telegram/ThemeManager.h
index dc8fcb93d..92ee6bf50 100644
--- a/td/telegram/ThemeManager.h
+++ b/td/telegram/ThemeManager.h
@@ -38,6 +38,7 @@ class ThemeManager final : public Actor {
 
   struct ThemeSettings {
     int32 accent_color = 0;
+    int32 message_accent_color = 0;
     BackgroundId background_id;
     BackgroundType background_type;
     BaseTheme base_theme;