aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/mail-callbacks.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 0bc2898d27..256d23846d 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -344,19 +344,11 @@ composer_get_message (EMsgComposer *composer)
return NULL;
/* Check for recipients */
- for (num_addrs = 0, i = 0; i < 3 && num_addrs == 0; i++) {
+ for (num_addrs = 0, i = 0; i < 3; i++) {
iaddr = camel_mime_message_get_recipients (message, recipient_type[i]);
num_addrs += iaddr ? camel_address_length (CAMEL_ADDRESS (iaddr)) : 0;
}
- if (num_addrs == camel_address_length (CAMEL_ADDRESS (iaddr))) {
- /* this means that the only recipients are Bcc's */
- if (!ask_confirm_for_only_bcc (composer)) {
- camel_object_unref (CAMEL_OBJECT (message));
- return NULL;
- }
- }
-
/* I'm sensing a lack of love, er, I mean recipients. */
if (num_addrs == 0) {
GtkWidget *message_box;
@@ -373,6 +365,14 @@ composer_get_message (EMsgComposer *composer)
return NULL;
}
+ if (iaddr && num_addrs == camel_address_length (CAMEL_ADDRESS (iaddr))) {
+ /* this means that the only recipients are Bcc's */
+ if (!ask_confirm_for_only_bcc (composer)) {
+ camel_object_unref (CAMEL_OBJECT (message));
+ return NULL;
+ }
+ }
+
/* Check for no subject */
subject = camel_mime_message_get_subject (message);
if (subject == NULL || subject[0] == '\0') {