diff --git a/modules/smtp/doc_classes/EMail.xml b/modules/smtp/doc_classes/EMail.xml
index 45758ceb8..1bca7a047 100644
--- a/modules/smtp/doc_classes/EMail.xml
+++ b/modules/smtp/doc_classes/EMail.xml
@@ -77,11 +77,6 @@
 			<description>
 			</description>
 		</method>
-		<method name="get_sender_address" qualifiers="const">
-			<return type="String" />
-			<description>
-			</description>
-		</method>
 		<method name="get_to_data_string">
 			<return type="String" />
 			<description>
@@ -146,16 +141,12 @@
 			<description>
 			</description>
 		</method>
-		<method name="set_sender_address">
-			<return type="void" />
-			<argument index="0" name="val" type="String" />
-			<description>
-			</description>
-		</method>
 	</methods>
 	<members>
 		<member name="body" type="String" setter="set_body" getter="get_body" default="&quot;&quot;">
 		</member>
+		<member name="sender_address" type="String" setter="set_sender_address" getter="get_sender_address" default="&quot;&quot;">
+		</member>
 		<member name="sender_personal" type="String" setter="set_sender_personal" getter="get_sender_personal" default="&quot;&quot;">
 		</member>
 		<member name="subject" type="String" setter="set_subject" getter="get_subject" default="&quot;&quot;">
diff --git a/modules/smtp/doc_classes/SMTPClient.xml b/modules/smtp/doc_classes/SMTPClient.xml
index 2f70459c9..6e06d8b11 100644
--- a/modules/smtp/doc_classes/SMTPClient.xml
+++ b/modules/smtp/doc_classes/SMTPClient.xml
@@ -55,5 +55,15 @@
 		</signal>
 	</signals>
 	<constants>
+		<constant name="TLS_METHOD_NONE" value="0" enum="TLSMethod">
+		</constant>
+		<constant name="TLS_METHOD_STARTTLS" value="1" enum="TLSMethod">
+		</constant>
+		<constant name="TLS_METHOD_SMTPS" value="2" enum="TLSMethod">
+		</constant>
+		<constant name="SERVER_AUTH_PLAIN" value="0" enum="ServerAuthMethod">
+		</constant>
+		<constant name="SERVER_AUTH_LOGIN" value="1" enum="ServerAuthMethod">
+		</constant>
 	</constants>
 </class>
diff --git a/modules/smtp/smtp_client.cpp b/modules/smtp/smtp_client.cpp
index 574dcaa5c..97223a4dd 100644
--- a/modules/smtp/smtp_client.cpp
+++ b/modules/smtp/smtp_client.cpp
@@ -725,4 +725,11 @@ void SMTPClient::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "thread_sleep_usec"), "set_thread_sleep_usec", "get_thread_sleep_usec");
 
 	ClassDB::bind_method(D_METHOD("send_email", "email"), &SMTPClient::send_email);
+
+	BIND_ENUM_CONSTANT(TLS_METHOD_NONE);
+	BIND_ENUM_CONSTANT(TLS_METHOD_STARTTLS);
+	BIND_ENUM_CONSTANT(TLS_METHOD_SMTPS);
+
+	BIND_ENUM_CONSTANT(SERVER_AUTH_PLAIN);
+	BIND_ENUM_CONSTANT(SERVER_AUTH_LOGIN);
 }