diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc
index e48a43717..31097acb7 100644
--- a/Documentation/SOGoInstallationGuide.asciidoc
+++ b/Documentation/SOGoInstallationGuide.asciidoc
@@ -2490,6 +2490,9 @@ Defaults to `NO` when unset.
 
 Defaults to `inline` when unset.
 
+|U |SOGoMailDisplayFullEmail
+|Show recipients or sender full email in mailboxes if set to `YES`. Default value is `NO`.
+
 |U |SOGoMailHideInlineAttachments
 |Hide inline message as attachements if set to `YES`. Default value is `NO`.
 
diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index e5fde2443..bdfdb448b 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -124,6 +124,7 @@
     SOGoMailComposeMessageType = "html";
     SOGoMailComposeFontSize = "0";
     SOGoMailHideInlineAttachments = NO;
+    SOGoMailDisplayFullEmail = NO;
     SOGoMailDisplayRemoteInlineImages = "never";
     SOGoMailCertificateEnabled = YES;
 
diff --git a/SoObjects/SOGo/SOGoUserDefaults.h b/SoObjects/SOGo/SOGoUserDefaults.h
index c079f398a..cd698f4d8 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.h
+++ b/SoObjects/SOGo/SOGoUserDefaults.h
@@ -156,6 +156,9 @@ extern NSString *SOGoPasswordRecoverySecondaryEmail;
 - (void) setMailComposeFontSize: (int) newValue;
 - (int) mailComposeFontSize;
 
+- (void) setMailDisplayFullEmail: (BOOL *) newValue;
+- (BOOL *) mailDisplayFullEmail;
+
 - (void) setMailDisplayRemoteInlineImages: (NSString *) newValue;
 - (NSString *) mailDisplayRemoteInlineImages;
 
diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m
index c272ac169..3f8dc2486 100644
--- a/SoObjects/SOGo/SOGoUserDefaults.m
+++ b/SoObjects/SOGo/SOGoUserDefaults.m
@@ -631,6 +631,16 @@ NSString *SOGoPasswordRecoverySecondaryEmail = @"SecondaryEmail";
   return [self integerForKey: @"SOGoMailComposeFontSize"];
 }
 
+- (void) setMailDisplayFullEmail: (BOOL *) newValue
+{
+  [self setBool: newValue forKey: @"SOGoMailDisplayFullEmail"];
+}
+
+- (BOOL *) mailDisplayFullEmail;
+{
+  return [self boolForKey: @"SOGoMailDisplayFullEmail"];
+}
+
 - (void) setMailDisplayRemoteInlineImages: (NSString *) newValue
 {
   [self setObject: newValue forKey: @"SOGoMailDisplayRemoteInlineImages"];
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index ce40cb694..e778832be 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Insert signature on new message" = "Insert signature on new message";
 "Insert signature on reply" = "Insert signature on reply";
 "Insert signature on forward" = "Insert signature on forward";
+"Show recipients or sender full email in mailboxes" = "Show recipients or sender full email in mailboxes";
 "Hide inline attachments" = "Hide inline attachments";
 
 /* Base font size for messages composed in HTML */
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 482f01589..09534d430 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -204,6 +204,7 @@
 "Insert signature on new message" = "Insérer la signature sur un nouveau message";
 "Insert signature on reply" = "Insérer la signature sur une réponse";
 "Insert signature on forward" = "Insérer la signature sur un transfert";
+"Show recipients or sender full email in mailboxes" = "Afficher l'email complet du destinataire ou expéditeur dans les boîtes aux lettres";
 "Hide inline attachments" = "Cacher les pièces jointes 'inline'";
 
 /* Base font size for messages composed in HTML */
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 75889851e..ad19fa26b 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -356,6 +356,9 @@ static SoProduct *preferencesProduct = nil;
     [[defaults source] setObject: [NSNumber numberWithBool: [defaults mailAddOutgoingAddresses]] forKey: @"SOGoMailAddOutgoingAddresses"];
 
 
+  if (![[defaults source] objectForKey: @"SOGoMailDisplayFullEmail"])
+    [[defaults source] setObject: [NSNumber numberWithBool: [defaults mailDisplayFullEmail]]  forKey: @"SOGoMailDisplayFullEmail"];
+
   if (![[defaults source] objectForKey: @"SOGoMailComposeMessageType"])
     [[defaults source] setObject: [defaults mailComposeMessageType] forKey: @"SOGoMailComposeMessageType"];
 
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 253288cdd..ca779bd24 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -695,6 +695,16 @@
               </md-checkbox>
             </div>
 
+            <div>
+              <md-checkbox
+                  ng-model="app.preferences.defaults.SOGoMailDisplayFullEmail"
+                  ng-true-value="1"
+                  ng-false-value="0"
+                  label:aria-label="Show recipients or sender full email in mailboxes">
+                <var:string label:value="Show recipients or sender full email in mailboxes"/>
+              </md-checkbox>
+            </div>
+
             <div>
               <md-checkbox
                   ng-model="app.preferences.defaults.SOGoMailHideInlineAttachments"
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index e99a54e1e..cfccabc19 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -273,7 +273,7 @@
    * @desc Format the first address of a specific type with a short description.
    * @returns a string of the name or the email of the envelope address type
    */
-  Message.prototype.$shortAddress = function (type) {
+  Message.prototype.$shortAddress = function (type, fullEmail) {
     var address = '';
     if (this[type]) {
       if (angular.isString(this[type])) {
@@ -289,7 +289,16 @@
       }
       else if (this[type].length > 0) {
         // We have an array of objects; pick the first one
-        address = this[type][0].name || this[type][0].email || '';
+        if(!fullEmail)
+          address = this[type][0].name || this[type][0].email || '';
+        else if(this[type][0].name && this[type][0].email)
+          address = this[type][0].name + ' <' + this[type][0].email +'>';
+        else if(this[type][0].name)
+          address = this[type][0].name;
+        else if(this[type][0].email)
+          address = this[type][0].email;
+        else
+          address =  '';
       }
     }
 
diff --git a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
index 960b3eef0..07e54f06e 100644
--- a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
@@ -58,8 +58,8 @@
   /**
    * @ngInject
    */
-  sgMessageListItemMainController.$inject = ['$scope', '$element', '$parse', '$state', '$mdUtil', '$mdToast', 'Mailbox', 'Message', 'encodeUriFilter'];
-  function sgMessageListItemMainController($scope, $element, $parse, $state, $mdUtil, $mdToast, Mailbox, Message, encodeUriFilter) {
+  sgMessageListItemMainController.$inject = ['$scope', '$element', '$parse', '$state', '$mdUtil', '$mdToast', 'Mailbox', 'Message', 'encodeUriFilter', 'Preferences'];
+  function sgMessageListItemMainController($scope, $element, $parse, $state, $mdUtil, $mdToast, Mailbox, Message, encodeUriFilter, Preferences) {
     var $ctrl = this;
 
     this.$postLink = function () {
@@ -83,7 +83,6 @@
       threadButton = angular.element(threadButton);
       this.threadIconElement = threadButton.find('md-icon')[0];
       this.threadCountElement = threadButton.find('span')[0];
-
       this.priorityIconElement = contentDivElement.find('md-icon')[0];
 
       if (Mailbox.$virtualMode) {
@@ -144,9 +143,9 @@
 
           // Sender or recipient when in Sent or Draft mailbox
           if ($ctrl.MailboxService.selectedFolder.isSentFolder || $ctrl.MailboxService.selectedFolder.isDraftsFolder)
-            $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to').encodeEntities();
+            $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to', Preferences.defaults.SOGoMailDisplayFullEmail).encodeEntities();
           else
-            $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from').encodeEntities();
+            $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from', Preferences.defaults.SOGoMailDisplayFullEmail).encodeEntities();
 
           // Priority icon
           if ($ctrl.message.priority && $ctrl.message.priority.level < 3) {