merge
authorKrista Bennett <krista@pep-project.org>
Tue, 24 Oct 2017 11:26:38 +0200
changeset 21930dc7346c26fc
parent 2192 e64be60a4d49
parent 2190 c98dd5d06c84
child 2194 27024582896d
child 2195 cf2509784622
child 2197 dabca211d42b
merge
src/message_api.c
     1.1 --- a/src/message_api.c	Tue Oct 24 11:25:48 2017 +0200
     1.2 +++ b/src/message_api.c	Tue Oct 24 11:26:38 2017 +0200
     1.3 @@ -787,15 +787,15 @@
     1.4          _envelope->longmsg = encapsulate_message_wrap_info("TRANSPORT", _envelope->longmsg);
     1.5      }
     1.6      char* message_text = NULL;
     1.7 -    
     1.8 +
     1.9 +    /* prevent introduction of pEp in inner message */
    1.10 +
    1.11      if (!attachment->shortmsg) {
    1.12          attachment->shortmsg = strdup("");
    1.13          if (!attachment->shortmsg)
    1.14              goto enomem;
    1.15      }
    1.16 -    
    1.17 -    /* prevent introduction of pEp in inner message */
    1.18 -        
    1.19 +            
    1.20      /* Turn message into a MIME-blob */
    1.21      status = mime_encode_message(attachment, false, &message_text);
    1.22