diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
index e0f598b3dfb..1d4a90a4f6d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
@@ -87,7 +87,7 @@ sub MessageToMTA {
         # Sendmail will automatically append our hostname to the From
         # address, but other mailers won't.
         my $urlbase = Bugzilla->params->{'urlbase'};
-        $urlbase =~ m|//([^/]+)/?|;
+        $urlbase =~ m|//([^:/]+)[:/]?|;
         $hostname = $1;
         $from .= "\@$hostname" if $from !~ /@/;
         $email->header_set('From', $from);