diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index 5c7b916f2860..d3134fcfc9bd 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -252,7 +252,6 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Konto Bestätigung',
   'confirmation_header' => 'Konto Bestätigung',
   'confirmation_message' => 'Bitte klicke auf den folgenden Link um dein Konto zu bestätigen.',
-  'invoice_subject' => 'Neue Rechnung :invoice',
   'invoice_message' => 'Um Ihre Rechnung über :amount einzusehen, klicken Sie bitte auf den folgenden Link.',
   'payment_subject' => 'Zahlungseingang :invoice',
   'payment_message' => 'Vielen Dank für Ihre Zahlung von :amount.',
@@ -303,6 +302,8 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
-    
+  'password' => 'Password',
+  'invoice_subject' => 'New invoice from :account',
+  
+      
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 4b61c609d9e8..68a11ea708c0 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -252,7 +252,7 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Account Confirmation',
   'confirmation_header' => 'Account Confirmation',
   'confirmation_message' => 'Please access the link below to confirm your account.',
-  'invoice_subject' => 'New invoice :invoice',
+  'invoice_subject' => 'New invoice from :account',
   'invoice_message' => 'To view your invoice for :amount, click the link below.',
   'payment_subject' => 'Payment Received :invoice',
   'payment_message' => 'Thank you for your payment of :amount.',
@@ -303,7 +303,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
+  'password' => 'Password',
 
 
 );
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index 94ed993b7497..557487330ddc 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -251,7 +251,7 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Account Confirmation',
   'confirmation_header' => 'Account Confirmation',
   'confirmation_message' => 'Please access the link below to confirm your account.',
-  'invoice_subject' => 'New invoice :invoice',
+  'invoice_subject' => 'New invoice from :account',
   'invoice_message' => 'To view your invoice for :amount, click the link below.',
   'payment_subject' => 'Payment Received :invoice',
   'payment_message' => 'Thank you for your payment of :amount.',
@@ -302,7 +302,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
+  'password' => 'Password',
   
     
 );
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index 36b715f87c6f..722c5064b0bb 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -252,7 +252,7 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Account Confirmation',
   'confirmation_header' => 'Account Confirmation',
   'confirmation_message' => 'Please access the link below to confirm your account.',
-  'invoice_subject' => 'New invoice :invoice',
+  'invoice_subject' => 'New invoice from :account',
   'invoice_message' => 'To view your invoice for :amount, click the link below.',
   'payment_subject' => 'Payment Received :invoice',
   'payment_message' => 'Thank you for your payment of :amount.',
@@ -303,7 +303,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
+  'password' => 'Password',
   
     
 );
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index 8a9cd04c04ab..14490fe17c8f 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -252,7 +252,7 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Account Confirmation',
   'confirmation_header' => 'Account Confirmation',
   'confirmation_message' => 'Please access the link below to confirm your account.',
-  'invoice_subject' => 'New invoice :invoice',
+  'invoice_subject' => 'New invoice from :account',
   'invoice_message' => 'To view your invoice for :amount, click the link below.',
   'payment_subject' => 'Payment Received :invoice',
   'payment_message' => 'Thank you for your payment of :amount.',
@@ -303,7 +303,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
+  'password' => 'Password',
 
   
   
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 332a22e751e2..8924bee0a367 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -252,7 +252,6 @@ return array(
   'confirmation_subject' => 'Invoice Ninja Bevestiging Account',
   'confirmation_header' => 'Bevestiging Account',
   'confirmation_message' => 'Ga alstublieft naar onderstaande link om je account te bevestiging.',
-  'invoice_subject' => 'Nieuwe factuur :invoice',
   'invoice_message' => 'Om je factuur voor :amount te bekijken, klik op onderstaande link.',
   'payment_subject' => 'Betaling ontvangen :invoice',
   'payment_message' => 'Bedankt voor je betaling van :amount.',
@@ -303,7 +302,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
-
-
+  'password' => 'Password',
+  'invoice_subject' => 'New invoice from :account',
+  
 );
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index d3ae05521d3a..fa6fc1a68ba2 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -251,7 +251,6 @@ return array(
   'confirmation_subject' => 'Confirmação de Conta do Invoice Ninja',
   'confirmation_header' => 'Confirmação de Conta',
   'confirmation_message' => 'Favor acessar o link abaixo para confirmar a sua conta.',
-  'invoice_subject' => 'Nova fatura :invoice',
   'invoice_message' => 'Para visualizar a sua fatura de :amount, clique no link abaixo.',
   'payment_subject' => 'Recebido Pagamento de :invoice',
   'payment_message' => 'Obrigado pelo seu pagamento de :amount.',
@@ -291,7 +290,7 @@ return array(
   'success' => 'Success',
   'success_message' => 'You have succesfully registered. Please visit the link in the account confirmation email to verify your email address.',
   'erase_data' => 'This will permanently erase your data.',
-
-
+  'password' => 'Password',
+  'invoice_subject' => 'New invoice from :account',
 
 );
diff --git a/app/ninja/mailers/ContactMailer.php b/app/ninja/mailers/ContactMailer.php
index d10405a32c95..37be8e02ed04 100755
--- a/app/ninja/mailers/ContactMailer.php
+++ b/app/ninja/mailers/ContactMailer.php
@@ -13,11 +13,11 @@ class ContactMailer extends Mailer {
 
 	public function sendInvoice(Invoice $invoice)
 	{
-		$view = 'invoice';
-		$subject = trans('texts.invoice_subject', ['invoice' => $invoice->invoice_number]);
-
 		$invoice->load('invitations', 'client', 'account');
 
+		$view = 'invoice';
+		$subject = trans('texts.invoice_subject', ['invoice' => $invoice->invoice_number, 'account' => $invoice->account->getDisplayName()]);
+
 		foreach ($invoice->invitations as $invitation)
 		{
 			if (!$invitation->user->email)