email domain can be selected

src/views/app.html

@@ -609,7 +609,7 @@
         <div class="task-active-overlay" ng-show="app.taskId"></div>
         <div class="row">
           <div class="col-md-12">
-            <label class="control-label" for="emailMailboxNameEnabled">Custom Mail FROM</label>
+            <label class="control-label" for="emailMailboxNameEnabled">Mail FROM Address</label>
             <p>This sets the address from which this app sends email. This app is already configured to send mail using {{app.domain}}'s <a ng-href="/#/email/{{ app.domain }}">Outbound Email</a> settings.</p>
 
             <fieldset>
@@ -622,12 +622,17 @@
                     <input type="text" class="form-control" name="mailboxName" placeholder="Leave empty to use platform default" ng-model="email.mailboxName">
 
                     <div class="input-group-btn">
-                      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" ng-disabled="!email.mailboxNameEnabled">
-                        @{{ email.domain.domain }}
+                      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                        <span>{{ email.mailboxDomain.domain }}</span>
+                        <span class="caret"></span>
                       </button>
+                      <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                        <li ng-repeat="domain in domains">
+                          <a href="" ng-click="email.mailboxDomain = domain">{{ domain.domain }}</a>
+                        </li>
+                      </ul>
                     </div>
                   </div>
-
                   <br/>
                 </div>
                 <input class="ng-hide" type="submit" ng-disabled="!emailForm.$dirty || email.busy"/>