diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
index dd8edfc42eb027c7c1740d740497ea6709d4c8ed..82e1a42058e1e9d7a23155449a82b63ce421d02c 100644
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
@@ -6,6 +6,8 @@
     # :port: 993
     # # Whether the IMAP server uses SSL
     # :ssl: true
+    # # Whether the IMAP server uses StartTLS
+    # :start_tls: false
     # # Email account username. Usually the full email address.
     # :email: "replies@gitlab.example.com"
     # # Email account password
diff --git a/doc/incoming_email/README.md b/doc/incoming_email/README.md
index c94e25bd4cc527a12a8f980a6c27b478e0d57fc7..01ab22321edcce3598e3573676a94655c658a2b6 100644
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
@@ -88,6 +88,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password
@@ -161,6 +163,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password