diff --git a/README.txt b/README.txt
index 42f158a..04708f8 100644
--- a/README.txt
+++ b/README.txt
@@ -11,13 +11,13 @@ CONTENTS OF THIS FILE
 INTRODUCTION
 ------------
 
-Form to Email allows you to send any form by email.
+Form to Email allows you to send any form to email.
 
 
 REQUIREMENTS
 ------------
 
-No special requirements
+No special requirements.
 
 
 INSTALLATION
diff --git a/forms_to_email.info b/forms_to_email.info
index 24b4c2d..4abbce5 100644
--- a/forms_to_email.info
+++ b/forms_to_email.info
@@ -1,4 +1,4 @@
 name = "Forms to Email"
-description = "Send any form by email."
+description = "Send any form by email"
 core = 7.x
 configure = admin/config/forms-to-email/settings
diff --git a/forms_to_email.install b/forms_to_email.install
index ac9583f..de2bf8a 100644
--- a/forms_to_email.install
+++ b/forms_to_email.install
@@ -9,7 +9,7 @@
  * Implements hook_uninstall().
  */
 function forms_to_email_uninstall() {
-  // Remove all variables.
+  // Remove all variables from variable table.
   db_delete('variable')
     ->condition('name', 'forms_to_email_%', 'like')
     ->execute();
diff --git a/forms_to_email.module b/forms_to_email.module
index 07e2594..23d4440 100644
--- a/forms_to_email.module
+++ b/forms_to_email.module
@@ -13,16 +13,20 @@ function forms_to_email_menu() {
 
   $items['admin/config/forms-to-email'] = array(
     'title' => 'Forms to E-mail',
-    'description' => 'Settings for Forms to Email.',
+    'page callback' => 'system_admin_menu_block_page',
     'access arguments' => array('administer access'),
-    'page callback' => 'drupal_get_form',
+    'description' => 'Settings for Forms to Email.',
     'page arguments' => array('forms_to_email_settings_form'),
     'weight' => -10,
   );
 
   $items['admin/config/forms-to-email/settings'] = array(
     'title' => 'Settings',
-    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'description' => 'General settings for Forms to Email',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('forms_to_email_settings_form'),
+    'access arguments' => array('administer access'),
+    'type' => MENU_NORMAL_ITEM,
     'weight' => -10,
   );
 
@@ -115,6 +119,7 @@ function forms_to_email_form_alter(&$form, $form_state, $form_id) {
     return FALSE;
   }
 
+  // Check if need disable other submits..
   $disable_other_submits = variable_get('forms_to_email_disable_other_submits', 'yes');
 
   if ($disable_other_submits == 'yes') {
@@ -228,9 +233,15 @@ function forms_to_email_send_form_to_email($data) {
   }
 
   foreach ($values as $label => $value) {
+
+    // Strip tags.
     $label = strip_tags($label);
     $value = strip_tags($value);
-    $body .= PHP_EOL . $label . ': ' . $value;
+
+    // Clear special chars.
+    $label = preg_replace("/[^ \w]+/", "", $label);
+
+    $body .= PHP_EOL . '__________________________________________' . PHP_EOL . $label . ': ' . $value;
   }
 
   if (!empty($from)) {
@@ -241,5 +252,15 @@ function forms_to_email_send_form_to_email($data) {
 
   $mail_sended = mail($to, $subject, $body, $headers);
 
+  if ($mail_sended) {
+    watchdog('forms_to_email', '<pre>E-mail has been sent.@break_line Headers: @headers @break_line To: @to @break_line Subject: @subject @break_line Body: @body</pre>', array(
+      '@break_line' => PHP_EOL,
+      '@headers' => $headers,
+      '@to' => $to,
+      '@subject' => $subject,
+      '@body' => $body,
+    ), WATCHDOG_INFO);
+  }
+
   return $mail_sended;
 }