1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler/create_note_handler.rb b/lib/gitlab/email/handler/create_note_handler.rb
index b168efaac11..e6c64e2b1d6 100644
--- a/lib/gitlab/email/handler/create_note_handler.rb
+++ b/lib/gitlab/email/handler/create_note_handler.rb
@@ -50,7 +50,9 @@ module Gitlab
         end
 
         def create_note
-          sent_notification.create_reply(note_message)
+          external_author = from_address if author == User.support_bot
+
+          sent_notification.create_reply(note_message, external_author)
         end
 
         def note_message