diff --git a/message.module b/message.module
index 2edfef2..58af2da 100644
--- a/message.module
+++ b/message.module
@@ -886,7 +886,7 @@ function message_type_delete($message) {
  */
 function message_create($type, $values = array(), $account = NULL) {
   global $language;
-  if (empty($account)) {
+  if (empty($account) && empty($values['uid'])) {
     global $user;
     $account = clone $user;
   }