diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index fa29a9a1e..85e34c3f1 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -49,7 +49,7 @@
                         md-highlight-flags="gi">{{ identity.full }}</span>
                 </div>
                 <div class="sg-md-body">
-                  <i ng-bind-html="editor.account.getTextSignature($index)"><!-- signature --></i>
+                  <i ng-bind-html="editor.account.getTextSignature(identity)"><!-- signature --></i>
                 </div>
               </div>
             </md-item-template>
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
index e208ca156..da2f5db3f 100644
--- a/UI/Templates/PreferencesUI/UIxAccountEditor.wox
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -118,7 +118,7 @@
                         </div>
                       </div>
                       <div class="sg-md-body">
-                        <i ng-bind-html="$AccountDialogController.account.getTextSignature($index)"><!-- signature --></i>
+                        <i ng-bind-html="$AccountDialogController.account.getTextSignature(identity)"><!-- signature --></i>
                       </div>
                     </div>
                     <md-button class="sg-icon-button" type="button"
diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js
index 503c8d7fd..7981c8956 100644
--- a/UI/WebServerResources/js/Mailer/Account.service.js
+++ b/UI/WebServerResources/js/Mailer/Account.service.js
@@ -327,19 +327,14 @@
    * @desc Create a plain text representation of the signature for the specified identity index.
    * @returns a plain text version of the signature
    */
-  Account.prototype.getTextSignature = function(index) {
-    if (index < this.identities.length) {
-      var identity = this.identities[index];
-      if (identity.signature) {
-        var element = angular.element('<div>' + identity.signature + '</div>');
-        identity.textSignature = _.map(element.contents(), 'textContent').join(' ').trim();
-      } else {
-        identity.textSignature = '';
-      }
-      return identity.textSignature;
+  Account.prototype.getTextSignature = function(identity) {
+    if (identity.signature) {
+      var element = angular.element('<div>' + identity.signature + '</div>');
+      identity.textSignature = _.map(element.contents(), 'textContent').join(' ').trim();
     } else {
-      throw Error('Index of identity is out of range');
+      identity.textSignature = '';
     }
+    return identity.textSignature;
   };
 
   /**