diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index 5babfb6ca..d4e054b6d 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -267,7 +267,6 @@
             </div>
           </div>
 
-
           <!-- note -->
           <md-input-container>
             <label class="right inline">
@@ -290,7 +289,7 @@
         </form>
 
         <!-- list editor -->
-        <form name="listForm" ng-show="card.$isList()" ng-submit="save(listForm)">
+        <form name="listForm" ng-if="card.$isList()" ng-submit="save(listForm)">
           <md-input-container>
             <label class="pseudo-input-label">
               <var:string label:value="Display"/>
@@ -319,13 +318,13 @@
             </label>
             <md-contact-chips
                 ng-model="card.refs"
-                md-contacts="addressbook.$filter($query, {dry: true, excludeLists: true})"
+                md-contacts="currentFolder.$filter($query, {dry: true, excludeLists: true})"
                 md-contact-name="shortFormat"
                 md-contact-image="image"
                 md-contact-email="email"
-                md-require-match="md-require-match"
-                placeholder="Add Member">
-            </md-contact-chips>
+                md-require-match="true"
+                filter-selected="false"
+                label:placeholder="Add Member"><!-- members --></md-contact-chips>
           </div>
           
           <div class="fieldset md-layout-margin" layout="row" layout-align="end center">
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index f90b00720..76cd04379 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -452,6 +452,7 @@
                     md-contact-image="image"
                     md-contact-email="c_email"
                     md-require-match="md-require-match"
+                    filter-selected="false"
                     placeholder="Add">
                   </md-contact-chips>
               </div>
diff --git a/UI/WebServerResources/js/Common/Gravatar.service.js b/UI/WebServerResources/js/Common/Gravatar.service.js
new file mode 100644
index 000000000..73967ddfd
--- /dev/null
+++ b/UI/WebServerResources/js/Common/Gravatar.service.js
@@ -0,0 +1,31 @@
+/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+(function() {
+  'use strict';
+
+  /**
+   * Gravatar - A service to build the Gravatar URL for an email address
+   * @memberof SOGo.Common
+   * @param {string} email
+   * @param {number} [size] - the size of the image
+   * @ngInject
+   */
+  function Gravatar() {
+    return function(email, size) {
+      var hash, s = size;
+      if (!email) {
+        return '';
+      }
+      if (!size) {
+        s = 48; // default to 48 pixels
+      }
+      hash = email.md5();
+
+      return 'https://www.gravatar.com/avatar/' + hash + '?s=' + s + '&d=wavatar';
+    }
+  }
+
+  angular
+    .module('SOGo.Common')
+    .factory('Gravatar', Gravatar);
+})();
diff --git a/UI/WebServerResources/js/Common/User.service.js b/UI/WebServerResources/js/Common/User.service.js
index a1047a366..c637f5e10 100644
--- a/UI/WebServerResources/js/Common/User.service.js
+++ b/UI/WebServerResources/js/Common/User.service.js
@@ -8,13 +8,7 @@
    */
   function User(userData) {
     if (userData) {
-      angular.extend(this, userData);
-      
-      if (!this.shortFormat)
-        this.shortFormat = this.$shortFormat();
-
-      // FIXME
-      this.image = "http://www.gravatar.com/avatar/asdasdasdasd?d=identicon";
+      this.init(userData);
     }
   }
 
@@ -23,10 +17,11 @@
    * @desc The factory we'll use to register with Angular.
    * @return the User constructor
    */
-  User.factory = ['$q', 'sgSettings', 'Resource', function($q, Settings, Resource) {
+  User.factory = ['$q', 'sgSettings', 'Resource', 'Gravatar', function($q, Settings, Resource, Gravatar) {
     angular.extend(User, {
       $q: $q,
-      $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser)
+      $$resource: new Resource(Settings.activeUser.folderURL, Settings.activeUser),
+      $gravatar: Gravatar
     });
 
     return User;
@@ -60,6 +55,20 @@
     });
   };
 
+  /**
+   * @function init
+   * @memberof User.prototype
+   * @desc Extend instance with required attributes and new data.
+   * @param {object} data - attributes of user
+   */
+  User.prototype.init = function(data) {
+    angular.extend(this, data);
+    if (!this.shortFormat)
+      this.shortFormat = this.$shortFormat();
+    if (!this.image)
+      this.image = User.$gravatar(this.c_email);
+  };
+
   /**
    * @function $shortFormat
    * @memberof User.prototype
diff --git a/UI/WebServerResources/js/Common/sgGravatarImage.directive.js b/UI/WebServerResources/js/Common/sgGravatarImage.directive.js
index 24fd0c01b..7e022b53e 100644
--- a/UI/WebServerResources/js/Common/sgGravatarImage.directive.js
+++ b/UI/WebServerResources/js/Common/sgGravatarImage.directive.js
@@ -10,25 +10,18 @@
      <sg-gravatar-image email="test@email.com" size="50"></sg-gravatar-image>
   */
 
-  function sgGravatarImage() {
+  sgGravatarImage.$inject = ['Gravatar'];
+  function sgGravatarImage(Gravatar) {
     return {
       restrict: 'AE',
       replace: true,
       required: 'email',
-      template: '<img ng-src="https://www.gravatar.com/avatar/{{hash}}?s={{size}}&d=wavatar" />',
+      template: '<img ng-src="{{url}}" />',
       link: function(scope, element, attrs) {
+        var size = attrs.size;
         attrs.$observe('email', function(value) {
           if (!value) { return; }
-
-          // MD5 (Message-Digest Algorithm) by WebToolkit
-          var md5=function(s){function L(k,d){return(k<<d)|(k>>>(32-d));}function K(G,k){var I,d,F,H,x;F=(G&2147483648);H=(k&2147483648);I=(G&1073741824);d=(k&1073741824);x=(G&1073741823)+(k&1073741823);if(I&d){return(x^2147483648^F^H);}if(I|d){if(x&1073741824){return(x^3221225472^F^H);}else{return(x^1073741824^F^H);}}else{return(x^F^H);}}function r(d,F,k){return(d&F)|((~d)&k);}function q(d,F,k){return(d&k)|(F&(~k));}function p(d,F,k){return(d^F^k);}function n(d,F,k){return(F^(d|(~k)));}function u(G,F,aa,Z,k,H,I){G=K(G,K(K(r(F,aa,Z),k),I));return K(L(G,H),F);}function f(G,F,aa,Z,k,H,I){G=K(G,K(K(q(F,aa,Z),k),I));return K(L(G,H),F);}function D(G,F,aa,Z,k,H,I){G=K(G,K(K(p(F,aa,Z),k),I));return K(L(G,H),F);}function t(G,F,aa,Z,k,H,I){G=K(G,K(K(n(F,aa,Z),k),I));return K(L(G,H),F);}function e(G){var Z;var F=G.length;var x=F+8;var k=(x-(x%64))/64;var I=(k+1)*16;var aa=Array(I-1);var d=0;var H=0;while(H<F){Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=(aa[Z]|(G.charCodeAt(H)<<d));H++;}Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=aa[Z]|(128<<d);aa[I-2]=F<<3;aa[I-1]=F>>>29;return aa;}function B(x){var k="",F="",G,d;for(d=0;d<=3;d++){G=(x>>>(d*8))&255;F="0"+G.toString(16);k=k+F.substr(F.length-2,2);}return k;}function J(k){k=k.replace(/rn/g,"n");var d="";for(var F=0;F<k.length;F++){var x=k.charCodeAt(F);if(x<128){d+=String.fromCharCode(x);}else{if((x>127)&&(x<2048)){d+=String.fromCharCode((x>>6)|192);d+=String.fromCharCode((x&63)|128);}else{d+=String.fromCharCode((x>>12)|224);d+=String.fromCharCode(((x>>6)&63)|128);d+=String.fromCharCode((x&63)|128);}}}return d;}var C=Array();var P,h,E,v,g,Y,X,W,V;var S=7,Q=12,N=17,M=22;var A=5,z=9,y=14,w=20;var o=4,m=11,l=16,j=23;var U=6,T=10,R=15,O=21;s=J(s);C=e(s);Y=1732584193;X=4023233417;W=2562383102;V=271733878;for(P=0;P<C.length;P+=16){h=Y;E=X;v=W;g=V;Y=u(Y,X,W,V,C[P+0],S,3614090360);V=u(V,Y,X,W,C[P+1],Q,3905402710);W=u(W,V,Y,X,C[P+2],N,606105819);X=u(X,W,V,Y,C[P+3],M,3250441966);Y=u(Y,X,W,V,C[P+4],S,4118548399);V=u(V,Y,X,W,C[P+5],Q,1200080426);W=u(W,V,Y,X,C[P+6],N,2821735955);X=u(X,W,V,Y,C[P+7],M,4249261313);Y=u(Y,X,W,V,C[P+8],S,1770035416);V=u(V,Y,X,W,C[P+9],Q,2336552879);W=u(W,V,Y,X,C[P+10],N,4294925233);X=u(X,W,V,Y,C[P+11],M,2304563134);Y=u(Y,X,W,V,C[P+12],S,1804603682);V=u(V,Y,X,W,C[P+13],Q,4254626195);W=u(W,V,Y,X,C[P+14],N,2792965006);X=u(X,W,V,Y,C[P+15],M,1236535329);Y=f(Y,X,W,V,C[P+1],A,4129170786);V=f(V,Y,X,W,C[P+6],z,3225465664);W=f(W,V,Y,X,C[P+11],y,643717713);X=f(X,W,V,Y,C[P+0],w,3921069994);Y=f(Y,X,W,V,C[P+5],A,3593408605);V=f(V,Y,X,W,C[P+10],z,38016083);W=f(W,V,Y,X,C[P+15],y,3634488961);X=f(X,W,V,Y,C[P+4],w,3889429448);Y=f(Y,X,W,V,C[P+9],A,568446438);V=f(V,Y,X,W,C[P+14],z,3275163606);W=f(W,V,Y,X,C[P+3],y,4107603335);X=f(X,W,V,Y,C[P+8],w,1163531501);Y=f(Y,X,W,V,C[P+13],A,2850285829);V=f(V,Y,X,W,C[P+2],z,4243563512);W=f(W,V,Y,X,C[P+7],y,1735328473);X=f(X,W,V,Y,C[P+12],w,2368359562);Y=D(Y,X,W,V,C[P+5],o,4294588738);V=D(V,Y,X,W,C[P+8],m,2272392833);W=D(W,V,Y,X,C[P+11],l,1839030562);X=D(X,W,V,Y,C[P+14],j,4259657740);Y=D(Y,X,W,V,C[P+1],o,2763975236);V=D(V,Y,X,W,C[P+4],m,1272893353);W=D(W,V,Y,X,C[P+7],l,4139469664);X=D(X,W,V,Y,C[P+10],j,3200236656);Y=D(Y,X,W,V,C[P+13],o,681279174);V=D(V,Y,X,W,C[P+0],m,3936430074);W=D(W,V,Y,X,C[P+3],l,3572445317);X=D(X,W,V,Y,C[P+6],j,76029189);Y=D(Y,X,W,V,C[P+9],o,3654602809);V=D(V,Y,X,W,C[P+12],m,3873151461);W=D(W,V,Y,X,C[P+15],l,530742520);X=D(X,W,V,Y,C[P+2],j,3299628645);Y=t(Y,X,W,V,C[P+0],U,4096336452);V=t(V,Y,X,W,C[P+7],T,1126891415);W=t(W,V,Y,X,C[P+14],R,2878612391);X=t(X,W,V,Y,C[P+5],O,4237533241);Y=t(Y,X,W,V,C[P+12],U,1700485571);V=t(V,Y,X,W,C[P+3],T,2399980690);W=t(W,V,Y,X,C[P+10],R,4293915773);X=t(X,W,V,Y,C[P+1],O,2240044497);Y=t(Y,X,W,V,C[P+8],U,1873313359);V=t(V,Y,X,W,C[P+15],T,4264355552);W=t(W,V,Y,X,C[P+6],R,2734768916);X=t(X,W,V,Y,C[P+13],O,1309151649);Y=t(Y,X,W,V,C[P+4],U,4149444226);V=t(V,Y,X,W,C[P+11],T,3174756917);W=t(W,V,Y,X,C[P+2],R,718787259);X=t(X,W,V,Y,C[P+9],O,3951481745);Y=K(Y,h);X=K(X,E);W=K(W,v);V=K(V,g);}var i=B(Y)+B(X)+B(W)+B(V);return i.toLowerCase();};
-
-          scope.hash = md5(value.toLowerCase());
-          scope.size = attrs.size;
-
-          if (angular.isUndefined(scope.size)) {
-            scope.size = 60; // default to 60 pixels
-          }
+          scope.url = Gravatar(value, size);
         });
       }
     };
diff --git a/UI/WebServerResources/js/Common/utils.js b/UI/WebServerResources/js/Common/utils.js
index 2d525ea37..e425d5c54 100644
--- a/UI/WebServerResources/js/Common/utils.js
+++ b/UI/WebServerResources/js/Common/utils.js
@@ -69,6 +69,13 @@ String.prototype.base64decode = function() {
   return output;
 };
 
+String.prototype.md5 = function() {
+  if (!this.length) { return; }
+  // MD5 (Message-Digest Algorithm) by WebToolkit
+  var md5 = function(s){function L(k,d){return(k<<d)|(k>>>(32-d));}function K(G,k){var I,d,F,H,x;F=(G&2147483648);H=(k&2147483648);I=(G&1073741824);d=(k&1073741824);x=(G&1073741823)+(k&1073741823);if(I&d){return(x^2147483648^F^H);}if(I|d){if(x&1073741824){return(x^3221225472^F^H);}else{return(x^1073741824^F^H);}}else{return(x^F^H);}}function r(d,F,k){return(d&F)|((~d)&k);}function q(d,F,k){return(d&k)|(F&(~k));}function p(d,F,k){return(d^F^k);}function n(d,F,k){return(F^(d|(~k)));}function u(G,F,aa,Z,k,H,I){G=K(G,K(K(r(F,aa,Z),k),I));return K(L(G,H),F);}function f(G,F,aa,Z,k,H,I){G=K(G,K(K(q(F,aa,Z),k),I));return K(L(G,H),F);}function D(G,F,aa,Z,k,H,I){G=K(G,K(K(p(F,aa,Z),k),I));return K(L(G,H),F);}function t(G,F,aa,Z,k,H,I){G=K(G,K(K(n(F,aa,Z),k),I));return K(L(G,H),F);}function e(G){var Z;var F=G.length;var x=F+8;var k=(x-(x%64))/64;var I=(k+1)*16;var aa=Array(I-1);var d=0;var H=0;while(H<F){Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=(aa[Z]|(G.charCodeAt(H)<<d));H++;}Z=(H-(H%4))/4;d=(H%4)*8;aa[Z]=aa[Z]|(128<<d);aa[I-2]=F<<3;aa[I-1]=F>>>29;return aa;}function B(x){var k="",F="",G,d;for(d=0;d<=3;d++){G=(x>>>(d*8))&255;F="0"+G.toString(16);k=k+F.substr(F.length-2,2);}return k;}function J(k){k=k.replace(/rn/g,"n");var d="";for(var F=0;F<k.length;F++){var x=k.charCodeAt(F);if(x<128){d+=String.fromCharCode(x);}else{if((x>127)&&(x<2048)){d+=String.fromCharCode((x>>6)|192);d+=String.fromCharCode((x&63)|128);}else{d+=String.fromCharCode((x>>12)|224);d+=String.fromCharCode(((x>>6)&63)|128);d+=String.fromCharCode((x&63)|128);}}}return d;}var C=Array();var P,h,E,v,g,Y,X,W,V;var S=7,Q=12,N=17,M=22;var A=5,z=9,y=14,w=20;var o=4,m=11,l=16,j=23;var U=6,T=10,R=15,O=21;s=J(s);C=e(s);Y=1732584193;X=4023233417;W=2562383102;V=271733878;for(P=0;P<C.length;P+=16){h=Y;E=X;v=W;g=V;Y=u(Y,X,W,V,C[P+0],S,3614090360);V=u(V,Y,X,W,C[P+1],Q,3905402710);W=u(W,V,Y,X,C[P+2],N,606105819);X=u(X,W,V,Y,C[P+3],M,3250441966);Y=u(Y,X,W,V,C[P+4],S,4118548399);V=u(V,Y,X,W,C[P+5],Q,1200080426);W=u(W,V,Y,X,C[P+6],N,2821735955);X=u(X,W,V,Y,C[P+7],M,4249261313);Y=u(Y,X,W,V,C[P+8],S,1770035416);V=u(V,Y,X,W,C[P+9],Q,2336552879);W=u(W,V,Y,X,C[P+10],N,4294925233);X=u(X,W,V,Y,C[P+11],M,2304563134);Y=u(Y,X,W,V,C[P+12],S,1804603682);V=u(V,Y,X,W,C[P+13],Q,4254626195);W=u(W,V,Y,X,C[P+14],N,2792965006);X=u(X,W,V,Y,C[P+15],M,1236535329);Y=f(Y,X,W,V,C[P+1],A,4129170786);V=f(V,Y,X,W,C[P+6],z,3225465664);W=f(W,V,Y,X,C[P+11],y,643717713);X=f(X,W,V,Y,C[P+0],w,3921069994);Y=f(Y,X,W,V,C[P+5],A,3593408605);V=f(V,Y,X,W,C[P+10],z,38016083);W=f(W,V,Y,X,C[P+15],y,3634488961);X=f(X,W,V,Y,C[P+4],w,3889429448);Y=f(Y,X,W,V,C[P+9],A,568446438);V=f(V,Y,X,W,C[P+14],z,3275163606);W=f(W,V,Y,X,C[P+3],y,4107603335);X=f(X,W,V,Y,C[P+8],w,1163531501);Y=f(Y,X,W,V,C[P+13],A,2850285829);V=f(V,Y,X,W,C[P+2],z,4243563512);W=f(W,V,Y,X,C[P+7],y,1735328473);X=f(X,W,V,Y,C[P+12],w,2368359562);Y=D(Y,X,W,V,C[P+5],o,4294588738);V=D(V,Y,X,W,C[P+8],m,2272392833);W=D(W,V,Y,X,C[P+11],l,1839030562);X=D(X,W,V,Y,C[P+14],j,4259657740);Y=D(Y,X,W,V,C[P+1],o,2763975236);V=D(V,Y,X,W,C[P+4],m,1272893353);W=D(W,V,Y,X,C[P+7],l,4139469664);X=D(X,W,V,Y,C[P+10],j,3200236656);Y=D(Y,X,W,V,C[P+13],o,681279174);V=D(V,Y,X,W,C[P+0],m,3936430074);W=D(W,V,Y,X,C[P+3],l,3572445317);X=D(X,W,V,Y,C[P+6],j,76029189);Y=D(Y,X,W,V,C[P+9],o,3654602809);V=D(V,Y,X,W,C[P+12],m,3873151461);W=D(W,V,Y,X,C[P+15],l,530742520);X=D(X,W,V,Y,C[P+2],j,3299628645);Y=t(Y,X,W,V,C[P+0],U,4096336452);V=t(V,Y,X,W,C[P+7],T,1126891415);W=t(W,V,Y,X,C[P+14],R,2878612391);X=t(X,W,V,Y,C[P+5],O,4237533241);Y=t(Y,X,W,V,C[P+12],U,1700485571);V=t(V,Y,X,W,C[P+3],T,2399980690);W=t(W,V,Y,X,C[P+10],R,4293915773);X=t(X,W,V,Y,C[P+1],O,2240044497);Y=t(Y,X,W,V,C[P+8],U,1873313359);V=t(V,Y,X,W,C[P+15],T,4264355552);W=t(W,V,Y,X,C[P+6],R,2734768916);X=t(X,W,V,Y,C[P+13],O,1309151649);Y=t(Y,X,W,V,C[P+4],U,4149444226);V=t(V,Y,X,W,C[P+11],T,3174756917);W=t(W,V,Y,X,C[P+2],R,718787259);X=t(X,W,V,Y,C[P+9],O,3951481745);Y=K(Y,h);X=K(X,E);W=K(W,v);V=K(V,g);}var i=B(Y)+B(X)+B(W)+B(V);return i.toLowerCase();};
+  return md5(this.toLowerCase());
+};
+
 String.prototype.capitalize = function() {
   return this.charAt(0).toUpperCase() + this.slice(1);
 }
diff --git a/UI/WebServerResources/js/Contacts/AddressBook.service.js b/UI/WebServerResources/js/Contacts/AddressBook.service.js
index 81eb8eaaf..47c6baaa2 100644
--- a/UI/WebServerResources/js/Contacts/AddressBook.service.js
+++ b/UI/WebServerResources/js/Contacts/AddressBook.service.js
@@ -210,7 +210,7 @@
         }
         // Instanciate Card objects
         angular.forEach(cards, function(o, i) {
-          cards[i] = new AddressBook.$Card(o);
+          cards[i] = new AddressBook.$Card(o, search);
         });
 
         return cards;
diff --git a/UI/WebServerResources/js/Contacts/Card.service.js b/UI/WebServerResources/js/Contacts/Card.service.js
index e9b6fe80c..792fb4e58 100644
--- a/UI/WebServerResources/js/Contacts/Card.service.js
+++ b/UI/WebServerResources/js/Contacts/Card.service.js
@@ -7,12 +7,13 @@
    * @name Card
    * @constructor
    * @param {object} futureCardData
+   * @param {string} [partial]
    */
-  function Card(futureCardData) {
+  function Card(futureCardData, partial) {
 
     // Data is immediately available
     if (typeof futureCardData.then !== 'function') {
-      angular.extend(this, futureCardData);
+      this.init(futureCardData, partial);
       if (this.pid && !this.id) {
         // Prepare for the creation of a new card;
         // Get UID from the server.
@@ -20,11 +21,6 @@
         this.$unwrap(newCardData);
         this.isNew = true;
       }
-
-      this.refs = [];
-
-      if (!this.shortFormat)
-        this.shortFormat = this.$shortFormat();
     }
     else {
       // The promise will be unwrapped first
@@ -42,10 +38,11 @@
    * @desc The factory we'll use to register with Angular.
    * @returns the Card constructor
    */
-  Card.$factory = ['$timeout', 'sgSettings', 'Resource', function($timeout, Settings, Resource) {
+  Card.$factory = ['$timeout', 'sgSettings', 'Resource', 'Gravatar', function($timeout, Settings, Resource, Gravatar) {
     angular.extend(Card, {
       $$resource: new Resource(Settings.activeUser.folderURL + 'Contacts', Settings.activeUser),
       $timeout: $timeout,
+      $gravatar: Gravatar,
       $categories: window.UserDefaults.SOGoContactsCategories
     });
 
@@ -109,6 +106,21 @@
     return collection;
   };
 
+  /**
+   * @function init
+   * @memberof Card.prototype
+   * @desc Extend instance with required attributes and new data.
+   * @param {object} data - attributes of card
+   */
+  Card.prototype.init = function(data, partial) {
+    this.refs = [];
+    angular.extend(this, data);
+    if (!this.shortFormat)
+      this.shortFormat = this.$shortFormat();
+    if (!this.image)
+      this.image = Card.$gravatar(this.$preferredEmail(partial), 32);
+  };
+
   /**
    * @function $id
    * @memberof Card.prototype
@@ -414,7 +426,7 @@
     this.$futureCardData.then(function(data) {
       // Calling $timeout will force Angular to refresh the view
       Card.$timeout(function() {
-        angular.extend(_this, data);
+        _this.init(data);
         // Instanciate Card objects for list members
         angular.forEach(_this.refs, function(o, i) {
           if (o.email) o.emails = [{value: o.email}];