diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases	2016-06-16 18:26:45.000000000 -0400
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30WebmailAliases	2020-06-27 14:47:23.150000000 -0400
@@ -14,9 +14,10 @@
 
     foreach $place ('webmail','horde')
     {
-        if (($port eq "80") && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL'))
+        if (($port eq "$httpPort") && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL'))
         {
-            $OUT .= "    RewriteRule ^/$place(/.*|\$)    https://%{HTTP_HOST}/$place\$1 [L,R]\n";
+            my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort";
+            $OUT .= "    RewriteRule ^/$place(/.*|\$)    https://%{HTTP_HOST}${portspec}/$place\$1 [L,R]\n";
         } else {
             $OUT .= "    Alias       /$place   $dirs{$place}\n";
         }
diff -Nur smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases
--- smeserver-horde-1.0.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases	2016-06-16 15:10:56.000000000 -0400
+++ smeserver-horde-1.0.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/35HordeActivesyncAliases	2020-06-27 14:47:23.153000000 -0400
@@ -7,12 +7,13 @@
     return "    # ActiveSync is disabled"
             unless $webmailStatus eq 'enabled' && $syncStatus eq 'enabled';
 
-        if (($port eq "80") && ($syncStatus eq 'enabled') && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL'))
+        if (($port eq "$httpPort") && ($syncStatus eq 'enabled') && ($haveSSL eq 'yes') && ($webmailAccessType eq 'SSL'))
         {
-            $OUT .= "    RewriteRule ^/Microsoft-Server-ActiveSync(/.*|\$)    https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n";
-            $OUT .= "    RewriteRule ^/autodiscover/autodiscover.xml(/.*|\$)    https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n";
-            $OUT .= "    RewriteRule ^/Autodiscover/Autodiscover.xml(/.*|\$)    https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n";
-            $OUT .= "    RewriteRule ^/AutoDiscover/AutoDiscover.xml(/.*|\$)    https://%{HTTP_HOST}/webmail/rpc.php\$1 [L,R]\n";
+            my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort";
+            $OUT .= "    RewriteRule ^/Microsoft-Server-ActiveSync(/.*|\$)    https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n";
+            $OUT .= "    RewriteRule ^/autodiscover/autodiscover.xml(/.*|\$)    https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n";
+            $OUT .= "    RewriteRule ^/Autodiscover/Autodiscover.xml(/.*|\$)    https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n";
+            $OUT .= "    RewriteRule ^/AutoDiscover/AutoDiscover.xml(/.*|\$)    https://%{HTTP_HOST}${portspec}/webmail/rpc.php\$1 [L,R]\n";
         } else {
             $OUT .= "    Alias       /Microsoft-Server-ActiveSync   /usr/share/horde/rpc.php\n";
             $OUT .= "    Alias       /autodiscover/autodiscover.xml /usr/share/horde/rpc.php\n";