diff --git a/mailboxes/boxes-lib.pl b/mailboxes/boxes-lib.pl
index dd4f6215b..9fe2e1d2b 100755
--- a/mailboxes/boxes-lib.pl
+++ b/mailboxes/boxes-lib.pl
@@ -878,11 +878,12 @@ elsif ($sm) {
 	# Connect to SMTP server
 	&open_socket($sm, $port, MAIL);
 	&smtp_command(MAIL);
+	my $helo = $config{'helo_name'} || &get_system_hostname();
 	if ($esmtp) {
-		&smtp_command(MAIL, "ehlo ".&get_system_hostname()."\r\n");
+		&smtp_command(MAIL, "ehlo $helo\r\n");
 		}
 	else {
-		&smtp_command(MAIL, "helo ".&get_system_hostname()."\r\n");
+		&smtp_command(MAIL, "helo $helo\r\n");
 		}
 
 	# Get username and password from parameters, or from module config
diff --git a/mailboxes/config.info b/mailboxes/config.info
index 6ec7c9050..217b932ff 100644
--- a/mailboxes/config.info
+++ b/mailboxes/config.info
@@ -53,6 +53,7 @@ from_virtualmin=Get From: address from Virtualmin?,1,1-Yes,0-No
 from_dom=Domain to use in From: address,3,System hostname
 no_orig_ip=Include browser IP in X-Originating-IP header?,1,0-Yes,1-No
 no_mailer=Include Webmin version in X-Mailer header?,1,0-Yes,1-No
+helo_name=Hostname to use in SMTP HELO line,3,Same as system hostname
 
 line1=System configuration,11
 mail_system=Mail server installed,4,1-Sendmail,0-Postfix,2-Qmail,4-Qmail+LDAP,5-Qmail+VPopMail,6-Exim,3-Detect automatically