diff --git a/smtp.mail.inc b/smtp.mail.inc
index 94b140b..ce3dd6d 100644
--- a/smtp.mail.inc
+++ b/smtp.mail.inc
@@ -77,13 +77,29 @@ class SmtpMailSystem implements MailSystemInterface {
       $mailer->SMTPDebug = TRUE;
     }
 
-    // Set the from name.
-    if (variable_get('smtp_fromname', '') != '') {
-      $from_name = variable_get('smtp_fromname', '');
+    // Set the from name. First we try to get the name from i18n, in the case
+    // that it has been translated. The name is set according to the language
+    // of the email being sent.
+    $from_name = FALSE;
+    if (function_exists('i18n_variable_get')) {
+      if (i18n_variable_get('smtp_fromname', $message['language'], '') != '') {
+        $from_name = i18n_variable_get('smtp_fromname', $message['language'], '');
+      }
+      else {
+        // If value is not defined in settings, use site_name.
+        $from_name = i18n_variable_get('site_name', $message['language'], '');
+      }
     }
-    else {
-      // If value is not defined in settings, use site_name.
-      $from_name = variable_get('site_name', '');
+
+    // If i18n is not enabled, we get the From Name through normal variables
+    if (!$from_name) {
+      if (variable_get('smtp_fromname', '') != '') {
+        $from_name = variable_get('smtp_fromname', '');
+      }
+      else {
+        // If value is not defined in settings, use site_name.
+        $from_name = variable_get('site_name', '');
+      }
     }
 
     //Hack to fix reply-to issue.
diff --git a/smtp.module b/smtp.module
index f858cf2..8f10d46 100644
--- a/smtp.module
+++ b/smtp.module
@@ -169,3 +169,22 @@ function smtp_failure_queue_runner($message) {
   $queue = DrupalQueue::get('smtp_send_queue');
   $queue->createItem($message);
 }
+
+/**
+ * Implements hook_variable_info().
+ *
+ * Allows for the SMTP from name to be translated
+ * if/when the Variable module is enabled.
+ *
+ * @link http://api.drupalhelp.net/api/variable/variable.api.php/function/hook_variable_info/7
+ * @param array $options
+ */
+function smtp_variable_info($options) {
+  $variable['smtp_fromname'] = array (
+    'title' => t('Email from name (SMTP module)'),
+    'type' => 'string',
+    'group' => 'smtp',
+  );
+
+  return $variable;
+}