diff --git a/app/Models/Account.php b/app/Models/Account.php
index ccf0e93bb098..e3573b622190 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -173,6 +173,7 @@ class Account extends Eloquent
         'payment_type_id',
         'gateway_fee_enabled',
         'reset_counter_date',
+        'reply_to_email',
     ];
 
     /**
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index 22b7e56fe738..765f660f6dd9 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -199,7 +199,7 @@ class ContactMailer extends Mailer
         }
 
         $subject = $this->templateService->processVariables($subject, $variables);
-        $fromEmail = $user->email;
+        $fromEmail = $account->reply_to_email ?: $user->email;
         $view = $account->getTemplateView(ENTITY_INVOICE);
 
         $response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, $view, $data);
@@ -291,9 +291,10 @@ class ContactMailer extends Mailer
         $data['invoice_id'] = $payment->invoice->id;
 
         $view = $account->getTemplateView('payment_confirmation');
+        $fromEmail = $account->reply_to_email ?: $user->email;
 
         if ($user->email && $contact->email) {
-            $this->sendTo($contact->email, $user->email, $accountName, $subject, $view, $data);
+            $this->sendTo($contact->email, $fromEmail, $accountName, $subject, $view, $data);
         }
 
         $account->loadLocalizationSettings();
diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index 84994c797b87..a7829b1f0620 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -265,6 +265,7 @@ class AccountTransformer extends EntityTransformer
             'payment_type_id' => (int) $account->payment_type_id,
             'gateway_fee_enabled' => (bool) $account->gateway_fee_enabled,
             'reset_counter_date' => $account->reset_counter_date,
+            'reply_to_email' => $account->reply_to_email,
         ];
     }
 }
diff --git a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
index 15b919b9b026..7d2215cbf5d9 100644
--- a/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
+++ b/database/migrations/2017_03_16_085702_add_gateway_fee_location.php
@@ -24,6 +24,7 @@ class AddGatewayFeeLocation extends Migration
             }
             $table->boolean('gateway_fee_enabled')->default(0);
             $table->date('reset_counter_date')->nullable();
+            $table->string('reply_to_email')->nullable();
         });
 
         Schema::table('clients', function ($table) {
@@ -52,6 +53,7 @@ class AddGatewayFeeLocation extends Migration
         Schema::table('accounts', function ($table) {
             $table->dropColumn('gateway_fee_enabled');
             $table->dropColumn('reset_counter_date');
+            $table->dropColumn('reply_to_email');
         });
 
         Schema::table('clients', function ($table) {
diff --git a/database/setup.sql b/database/setup.sql
index a2196deb7c70..b9dff9435d42 100644
--- a/database/setup.sql
+++ b/database/setup.sql
@@ -325,6 +325,7 @@ CREATE TABLE `accounts` (
   `payment_type_id` smallint(6) DEFAULT NULL,
   `gateway_fee_enabled` tinyint(1) NOT NULL DEFAULT '0',
   `reset_counter_date` date DEFAULT NULL,
+  `reply_to_email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `accounts_account_key_unique` (`account_key`),
   KEY `accounts_timezone_id_foreign` (`timezone_id`),
@@ -1148,7 +1149,7 @@ CREATE TABLE `gateways` (
 
 LOCK TABLES `gateways` WRITE;
 /*!40000 ALTER TABLE `gateways` DISABLE KEYS */;
-INSERT INTO `gateways` VALUES (1,'2017-03-30 05:35:29','2017-03-30 05:35:29','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-30 05:35:29','2017-03-30 05:35:29','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-30 05:35:29','2017-03-30 05:35:29','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-30 05:35:29','2017-03-30 05:35:29','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-30 05:35:29','2017-03-30 05:35:29','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-30 05:35:29','2017-03-30 05:35:29','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-30 05:35:29','2017-03-30 05:35:29','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-30 05:35:29','2017-03-30 05:35:29','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-30 05:35:29','2017-03-30 05:35:29','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-30 05:35:29','2017-03-30 05:35:29','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-30 05:35:29','2017-03-30 05:35:29','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-30 05:35:29','2017-03-30 05:35:29','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-30 05:35:29','2017-03-30 05:35:29','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-30 05:35:29','2017-03-30 05:35:29','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-30 05:35:29','2017-03-30 05:35:29','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-30 05:35:29','2017-03-30 05:35:29','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-30 05:35:29','2017-03-30 05:35:29','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-30 05:35:29','2017-03-30 05:35:29','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-30 05:35:29','2017-03-30 05:35:29','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-30 05:35:29','2017-03-30 05:35:29','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-30 05:35:29','2017-03-30 05:35:29','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-30 05:35:29','2017-03-30 05:35:29','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-30 05:35:29','2017-03-30 05:35:29','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-30 05:35:29','2017-03-30 05:35:29','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-30 05:35:29','2017-03-30 05:35:29','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-30 05:35:29','2017-03-30 05:35:29','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-30 05:35:29','2017-03-30 05:35:29','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-30 05:35:29','2017-03-30 05:35:29','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-30 05:35:29','2017-03-30 05:35:29','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-30 05:35:29','2017-03-30 05:35:29','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-30 05:35:29','2017-03-30 05:35:29','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-30 05:35:29','2017-03-30 05:35:29','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-30 05:35:29','2017-03-30 05:35:29','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-30 05:35:29','2017-03-30 05:35:29','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-30 05:35:29','2017-03-30 05:35:29','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-30 05:35:29','2017-03-30 05:35:29','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-30 05:35:29','2017-03-30 05:35:29','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-30 05:35:29','2017-03-30 05:35:29','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-30 05:35:29','2017-03-30 05:35:29','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-30 05:35:29','2017-03-30 05:35:29','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-30 05:35:29','2017-03-30 05:35:29','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-30 05:35:29','2017-03-30 05:35:29','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-30 05:35:29','2017-03-30 05:35:29','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-30 05:35:29','2017-03-30 05:35:29','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-30 05:35:29','2017-03-30 05:35:29','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-30 05:35:29','2017-03-30 05:35:29','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-30 05:35:29','2017-03-30 05:35:29','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-30 05:35:29','2017-03-30 05:35:29','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-30 05:35:29','2017-03-30 05:35:29','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-30 05:35:29','2017-03-30 05:35:29','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-30 05:35:29','2017-03-30 05:35:29','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-30 05:35:29','2017-03-30 05:35:29','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-30 05:35:29','2017-03-30 05:35:29','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-30 05:35:29','2017-03-30 05:35:29','Custom','Custom',1,1,8,0,NULL,1,0);
+INSERT INTO `gateways` VALUES (1,'2017-03-30 09:23:51','2017-03-30 09:23:51','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-03-30 09:23:51','2017-03-30 09:23:51','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-03-30 09:23:51','2017-03-30 09:23:51','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-03-30 09:23:51','2017-03-30 09:23:51','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-03-30 09:23:51','2017-03-30 09:23:51','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-03-30 09:23:51','2017-03-30 09:23:51','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-03-30 09:23:51','2017-03-30 09:23:51','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-03-30 09:23:51','2017-03-30 09:23:51','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-03-30 09:23:51','2017-03-30 09:23:51','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-03-30 09:23:51','2017-03-30 09:23:51','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-03-30 09:23:51','2017-03-30 09:23:51','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-03-30 09:23:51','2017-03-30 09:23:51','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-03-30 09:23:51','2017-03-30 09:23:51','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-03-30 09:23:51','2017-03-30 09:23:51','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-03-30 09:23:51','2017-03-30 09:23:51','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-03-30 09:23:51','2017-03-30 09:23:51','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-03-30 09:23:51','2017-03-30 09:23:51','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-03-30 09:23:51','2017-03-30 09:23:51','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-03-30 09:23:51','2017-03-30 09:23:51','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-03-30 09:23:51','2017-03-30 09:23:51','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-03-30 09:23:51','2017-03-30 09:23:51','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-03-30 09:23:51','2017-03-30 09:23:51','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-03-30 09:23:51','2017-03-30 09:23:51','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-03-30 09:23:51','2017-03-30 09:23:51','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-03-30 09:23:51','2017-03-30 09:23:51','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-03-30 09:23:51','2017-03-30 09:23:51','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-03-30 09:23:51','2017-03-30 09:23:51','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-03-30 09:23:51','2017-03-30 09:23:51','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-03-30 09:23:51','2017-03-30 09:23:51','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-03-30 09:23:51','2017-03-30 09:23:51','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-03-30 09:23:51','2017-03-30 09:23:51','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-03-30 09:23:51','2017-03-30 09:23:51','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-03-30 09:23:51','2017-03-30 09:23:51','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-03-30 09:23:51','2017-03-30 09:23:51','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-03-30 09:23:51','2017-03-30 09:23:51','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-03-30 09:23:51','2017-03-30 09:23:51','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-03-30 09:23:51','2017-03-30 09:23:51','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-03-30 09:23:51','2017-03-30 09:23:51','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-03-30 09:23:51','2017-03-30 09:23:51','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-03-30 09:23:51','2017-03-30 09:23:51','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-03-30 09:23:51','2017-03-30 09:23:51','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-03-30 09:23:51','2017-03-30 09:23:51','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-03-30 09:23:51','2017-03-30 09:23:51','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-03-30 09:23:51','2017-03-30 09:23:51','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-03-30 09:23:51','2017-03-30 09:23:51','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-03-30 09:23:51','2017-03-30 09:23:51','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-03-30 09:23:51','2017-03-30 09:23:51','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-03-30 09:23:51','2017-03-30 09:23:51','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-03-30 09:23:51','2017-03-30 09:23:51','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-03-30 09:23:51','2017-03-30 09:23:51','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-03-30 09:23:51','2017-03-30 09:23:51','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-03-30 09:23:51','2017-03-30 09:23:51','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-03-30 09:23:51','2017-03-30 09:23:51','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-03-30 09:23:51','2017-03-30 09:23:51','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-03-30 09:23:51','2017-03-30 09:23:51','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-03-30 09:23:51','2017-03-30 09:23:51','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-03-30 09:23:51','2017-03-30 09:23:51','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-03-30 09:23:51','2017-03-30 09:23:51','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-03-30 09:23:51','2017-03-30 09:23:51','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-03-30 09:23:51','2017-03-30 09:23:51','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-03-30 09:23:51','2017-03-30 09:23:51','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-03-30 09:23:51','2017-03-30 09:23:51','Custom','Custom',1,1,8,0,NULL,1,0);
 /*!40000 ALTER TABLE `gateways` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1566,7 +1567,7 @@ CREATE TABLE `payment_libraries` (
 
 LOCK TABLES `payment_libraries` WRITE;
 /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */;
-INSERT INTO `payment_libraries` VALUES (1,'2017-03-30 05:35:28','2017-03-30 05:35:28','Omnipay',1),(2,'2017-03-30 05:35:28','2017-03-30 05:35:28','PHP-Payments [Deprecated]',1);
+INSERT INTO `payment_libraries` VALUES (1,'2017-03-30 09:23:49','2017-03-30 09:23:49','Omnipay',1),(2,'2017-03-30 09:23:49','2017-03-30 09:23:49','PHP-Payments [Deprecated]',1);
 /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1676,7 +1677,7 @@ CREATE TABLE `payment_terms` (
 
 LOCK TABLES `payment_terms` WRITE;
 /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */;
-INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,1),(2,10,'Net 10','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,2),(3,14,'Net 14','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,3),(4,15,'Net 15','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,4),(5,30,'Net 30','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,5),(6,60,'Net 60','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,6),(7,90,'Net 90','2017-03-30 05:35:28','2017-03-30 05:35:28',NULL,0,0,7),(8,-1,'Net 0','2017-03-30 05:35:31','2017-03-30 05:35:31',NULL,0,0,0);
+INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,1),(2,10,'Net 10','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,2),(3,14,'Net 14','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,3),(4,15,'Net 15','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,4),(5,30,'Net 30','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,5),(6,60,'Net 60','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,6),(7,90,'Net 90','2017-03-30 09:23:49','2017-03-30 09:23:49',NULL,0,0,7),(8,-1,'Net 0','2017-03-30 09:23:52','2017-03-30 09:23:52',NULL,0,0,0);
 /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2271,4 +2272,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-03-30 11:35:31
+-- Dump completed on 2017-03-30 15:23:53
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 59d991920ea7..98c62f921332 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2307,7 +2307,6 @@ $LANG = array(
     'notes_reminder2' => 'Second Reminder',
     'notes_reminder3' => 'Third Reminder',
     'bcc_email' => 'BCC Email',
-    'bcc_email_help' => 'All emails sent to your clients will also be sent to this address.',
     'tax_quote' => 'Tax Quote',
     'tax_invoice' => 'Tax Invoice',
     'emailed_invoices' => 'Successfully emailed invoices',
@@ -2458,6 +2457,9 @@ $LANG = array(
     'purge_data_message' => 'Warning: This will permanently erase your data, there is no undo.',
     'contact_phone' => 'Contact Phone',
     'contact_email' => 'Contact Email',
+    'reply_to_email' => 'Reply-To Email',
+    'reply_to_email_help' => 'Specify the reply-to address for client emails.',
+    'bcc_email_help' => 'Privately include this address with client emails.',
 
 );
 
diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php
index ee2f4808f5eb..d86a9467ca89 100644
--- a/resources/views/accounts/email_settings.blade.php
+++ b/resources/views/accounts/email_settings.blade.php
@@ -19,6 +19,7 @@
 
     {!! Former::open()->rules([
             'bcc_email' => 'email',
+            'reply_to_email' => 'email',
         ])->addClass('warn-on-exit') !!}
 
     {{ Former::populate($account) }}
@@ -32,6 +33,15 @@
         </div>
         <div class="panel-body form-padding-right">
 
+            {!! Former::text('reply_to_email')
+                    ->placeholder(Auth::user()->registered ? Auth::user()->email : ' ')
+                    ->help('reply_to_email_help') !!}
+
+            {!! Former::text('bcc_email')
+                    ->help('bcc_email_help') !!}
+
+            &nbsp;
+
             {!! Former::checkbox('pdf_email_attachment')
                     ->text(trans('texts.enable'))
                     ->value(1)
@@ -46,10 +56,6 @@
 
             &nbsp;
 
-            {!! Former::text('bcc_email')->help('bcc_email_help') !!}
-
-            &nbsp;
-
             {{-- Former::select('recurring_hour')->options($recurringHours) --}}
 
         </div>