--- orig/contact.module	2007-01-10 16:17:51.000000000 +0100
+++ contact.module	2007-07-10 17:47:05.000000000 +0200
@@ -381,7 +374,7 @@ function contact_mail_user_submit($form_
   $body = implode("\n\n", $message);
 
   // Send the e-mail:
-  drupal_mail('contact-user-mail', $to, $subject, $body, $from);
+  $mail_success = drupal_mail('contact-user-mail', $to, $subject, $body, $from);
 
   // Send a copy if requested:
   if ($form_values['copy']) {
@@ -389,11 +382,15 @@ function contact_mail_user_submit($form_
   }
 
   // Log the operation:
+  if ($mail_success) {
   flood_register_event('contact');
   watchdog('mail', t('%name-from sent %name-to an e-mail.', array('%name-from' => $user->name, '%name-to' => $account->name)));
-
-  // Set a status message:
   drupal_set_message(t('The message has been sent.'));
+  }
+  else {
+    watchdog('mail', t('E-mail sending error - from personal contact form - sent to: ') . $account->name, WATCHDOG_ERROR);
+    drupal_set_message(t('Unable to send mail. Please contact the site admin.'));
+  }
 
   // Jump to the user's profile page:
   return "user/$account->uid";