diff --git a/src/eimap.erl b/src/eimap.erl
--- a/src/eimap.erl
+++ b/src/eimap.erl
@@ -295,12 +295,7 @@
     end,
     { next_state, idle, State#state{ current_command = undefined, server_id = ServerID } };
 handle_info({ { posttls_capabilities, Receiver, ResponseToken }, [Capabilities] }, _StateName, #state{ server_id = ServerID, passthrough = Passthrough, passthrough_recv = PassthroughReceiver } = State) ->
-    OurCapabilities =
-        case binary:match(Capabilities, <<"STARTTLS">>) of
-            nomatch -> <<Capabilities/binary, " STARTTLS">>;
-            _ -> Capabilities
-        end,
-    send_hello_string(OurCapabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
+    send_hello_string(Capabilities, ServerID, Receiver, ResponseToken, Passthrough, PassthroughReceiver),
     { next_state, idle, State#state{ current_command = none } };
 handle_info({ { selected, MBox }, ok }, StateName, State) ->
     %%lager:info("~p Selected mbox ~p", [self(), MBox]),