1.1 --- a/src/message_api.c	Wed Aug 07 16:04:40 2019 +0200
     1.2 +++ b/src/message_api.c	Wed Aug 07 16:39:00 2019 +0200
     1.3 @@ -1928,6 +1928,10 @@
     1.4          return PEP_UNENCRYPTED;
     1.5      }
     1.6      else {
     1.7 +        // First, dedup the keylist
     1.8 +        if (keys && keys->next)
     1.9 +            dedup_stringlist(keys->next);
    1.10 +            
    1.11          // FIXME - we need to deal with transport types (via flag)
    1.12          message_wrap_type wrap_type = PEP_message_unwrapped;
    1.13          if ((enc_format != PEP_enc_inline) && (!force_v_1) && ((max_comm_type | PEP_ct_confirmed) == PEP_ct_pEp)) {
    1.14 @@ -3848,7 +3852,9 @@
    1.15  
    1.16      // 2. Clean up message and prepare for return 
    1.17      if (msg) {
    1.18 -        
    1.19 +        if (_keylist && _keylist->next)
    1.20 +            dedup_stringlist(_keylist->next);
    1.21 +            
    1.22          /* add pEp-related status flags to header */
    1.23          decorate_message(msg, *rating, _keylist, false, false);
    1.24