Merge branch 'feature/user-roles' into feature/pref-user-templates

web/templates/pages/edit_server.html

@@ -366,7 +366,7 @@
                                         <?php if($_SESSION['WEBMAIL_SYSTEM']){?>   
                                         <tr>
                                             <td class="vst-text step-top">
-                                                <?php print _('Webmail URL') ?>
+                                                <?php print _('Webmail URL') ?> <span class="hint">(<?php echo $_SESSION['WEBMAIL_ALIAS'];?>.example.com)</span>
                                             </td>
                                         </tr>
                                         <tr>