@@ -915,9 +915,7 @@
}
else {
$mail->top_part->set(date => $mail->date_stamp);
- if ($CFG->{email}->{out} eq 'smtp') {
- $mail->top_part->set('Message-Id' => '<GMail.' . time . '.' . $$ . rand(10000) . '@' . $CFG->{email}->{smtp} . '>');
- }
+ $mail->top_part->set('Message-Id' => '<GMail.' . time . '.' . $$ . rand(10000) . '@' . ($CFG->{email}->{out} eq 'smtp' ? $CFG->{email}->{smtp} : $USER->{domain}) . '>');

# Check if we are over max for today
if ($CFG->{limits}{max_emails_per_day} and $CFG->{limits}{max_emails_per_day} > 0) {