[balsa] send: fix confusing RFC 4880 warning

[Peter Bloomfield <peterb src gnome org>]

commit f5b78db781e3fa735e986e47a437dc0c105d1ae5
Author: Albrecht Dreß <albrecht dress arcor de>
Date:   Tue Mar 5 11:58:57 2019 -0500

    send: fix confusing RFC 4880 warning
    
    * libbalsa/send.c (libbalsa_create_rfc2440_buffer): fix confusing
    bcc: encryption warning in libbalsa_create_rfc2440_buffer()
    if no bcc: recipients are present;
    (do_multipart_crypto): use singular/plural form of this warning
    in do_multipart_crypto().

 ChangeLog       |  8 ++++++++
 libbalsa/send.c | 14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b507be9cc..14ea838e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-03-05  Albrecht Dreß  <albrecht dress arcor de>
+
+       * libbalsa/send.c (libbalsa_create_rfc2440_buffer): fix confusing
+       bcc: encryption warning in libbalsa_create_rfc2440_buffer()
+       if no bcc: recipients are present;
+       (do_multipart_crypto): use singular/plural form of this warning
+       in do_multipart_crypto().
+
 2019-03-03  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Do not attach files in response to clicking a "mailto:"; URL
diff --git a/libbalsa/send.c b/libbalsa/send.c
index 51908f578..a68f1b079 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1822,7 +1822,8 @@ libbalsa_create_rfc2440_buffer(LibBalsaMessage *message,
                                         message->headers->cc_list);
         encrypt_for = get_mailbox_names(encrypt_for,
                                         message->headers->from);
-        if (message->headers->bcc_list != NULL) {
+        if ((message->headers->bcc_list != NULL) &&
+               (internet_address_list_length(message->headers->bcc_list) > 0)) {
             libbalsa_information
                 (LIBBALSA_INFORMATION_WARNING,
                 ngettext("This message will not be encrypted "
@@ -1918,9 +1919,14 @@ do_multipart_crypto(LibBalsaMessage *message,
         if (message->headers->bcc_list
             && (internet_address_list_length(message->headers->
                                              bcc_list) > 0)) {
-            libbalsa_information(LIBBALSA_INFORMATION_WARNING,
-                                 _(
-                                     "This message will not be encrypted for the BCC: recipient(s)."));
+            libbalsa_information
+                (LIBBALSA_INFORMATION_WARNING,
+                ngettext("This message will not be encrypted "
+                         "for the BCC: recipient.",
+                         "This message will not be encrypted "
+                         "for the BCC: recipients.",
+                         internet_address_list_length
+                             (message->headers->bcc_list)));
         }
 
         if (message->gpg_mode & LIBBALSA_PROTECT_SIGN) {