diff --git a/anonymous_contact.info b/anonymous_contact.info
index b00ba06..e632a58 100644
--- a/anonymous_contact.info
+++ b/anonymous_contact.info
@@ -1,4 +1,11 @@
+; $Id: anonymous_contact.info,v 1.1 2010/05/20 02:33:17 gold Exp $
 name = Anonymous Contact
-package = Mail
+package = Ebiz modules
 description = "A contact form that allows an anonymous user to send mail to a User."
-core = "6.x"
+core = "7.x"
+
+; Information added by drupal.org packaging script on 2010-06-01
+version = "7.x-1.1"
+core = "7.x"
+project = "anonymous_contact"
+datestamp = "1275369303"
diff --git a/anonymous_contact.module b/anonymous_contact.module
index d4af64a..ae61126 100644
--- a/anonymous_contact.module
+++ b/anonymous_contact.module
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Implementation of hook_menu().
  */
@@ -52,8 +53,8 @@ function anonymous_contact_page($account) {
 /**
  * The contact form.
  */
-function anonymous_contact_form(&$form_state, $recipient) {
-
+function anonymous_contact_form($form, &$form_state, $recipient) {
+  global $user;
   $form['recipient'] = array('#type' => 'value', '#value' => $recipient);
   $form['name'] = array(
     '#type' => 'textfield',
@@ -66,9 +67,8 @@ function anonymous_contact_form(&$form_state, $recipient) {
     '#required' => TRUE,
   );
   $form['to'] = array('#type' => 'item',
-    '#title' => t('To'),
-    '#value' => theme('username', $recipient),
-  );
+    '#title' => t('To') . theme('username', array('account' => $user) ),
+   );
   $form['subject'] = array('#type' => 'textfield',
     '#title' => t('Subject'),
     '#maxlength' => 50,
@@ -107,6 +107,7 @@ function anonymous_contact_form_submit($form, &$form_state) {
 
   // Send to the requested user.
   $to = $account->mail;
+  $fake_user= new stdClass();
   $from = sprintf('"%s" <%s>', $form_state['values']['name'], $form_state['values']['from']);
   $fake_user->name = $form_state['values']['name'];
   $fake_user->mail = $form_state['values']['from'];
@@ -121,6 +122,7 @@ function anonymous_contact_form_submit($form, &$form_state) {
   // Send a copy if requested, using current page language.
   if ($form_state['values']['copy']) {
     drupal_mail('anonymous_contact', 'user_copy', $from, $language, $values, $from);
+
   }
 
   flood_register_event('contact');
@@ -139,10 +141,10 @@ function anonymous_contact_mail($key, &$message, $params) {
     case 'user_copy':
       $user = $params['user'];
       $account = $params['account'];
-      $message['subject'] .= '['. variable_get('site_name', 'Drupal') .'] '. $params['subject'];
+      $message['subject'] .= '[' . variable_get('site_name', 'Drupal') . '] ' . $params['subject'];
       $message['body'][] = "$account->name,";
-      $message['body'][] = t("!name has sent you a message via the contact form at !site.", array('!name' => $user->name, '!site' => variable_get('site_name', 'Drupal')), $language->language);
-      $message['body'][] = t('Message:', NULL, $language->language);
+      $message['body'][] = t("!name has sent you a message via the contact form at !site.", array('!name' => $user->name, '!site' => variable_get('site_name', 'Drupal')), array("langcode" => $language->language));
+      $message['body'][] = t('Message:', array(), array("langcode" => $language->language));
       $message['body'][] = $params['message'];
       break;
   }