diff --git a/.gitignore b/.gitignore
index 884439b3edc7..3a81b534411e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 /public/build
 /public/vendor
 /bootstrap/compiled.php
+/bootstrap/environment.php
 /vendor
 composer.phar
 .DS_Store
diff --git a/app/config/gae-development/database.php b/app/config/gae-development/database.php
old mode 100644
new mode 100755
diff --git a/app/config/gae-production/cache.php b/app/config/gae-production/cache.php
old mode 100644
new mode 100755
diff --git a/app/config/gae-production/database.php b/app/config/gae-production/database.php
old mode 100644
new mode 100755
diff --git a/app/config/gae-production/session.php b/app/config/gae-production/session.php
old mode 100644
new mode 100755
diff --git a/app/ninja/mailers/ContactMailer.php b/app/ninja/mailers/ContactMailer.php
index c2290d44dede..2c2f504a2ffd 100755
--- a/app/ninja/mailers/ContactMailer.php
+++ b/app/ninja/mailers/ContactMailer.php
@@ -21,7 +21,7 @@ class ContactMailer extends Mailer {
 	
 			$data = array('link' => URL::to('view') . '/' . $invitation->invitation_key);		
 
-			$this->sendTo($invitation->contact->email, $subject, $view, $data);
+			$this->sendTo($invitation->contact->email, $invitation->user->email, $subject, $view, $data);
 
 			Activity::emailInvoice($invitation);
 		}
diff --git a/app/ninja/mailers/Mailer.php b/app/ninja/mailers/Mailer.php
index 4452e97760e4..ca612beb963d 100755
--- a/app/ninja/mailers/Mailer.php
+++ b/app/ninja/mailers/Mailer.php
@@ -4,16 +4,16 @@ use Mail;
 
 abstract class Mailer {
 
-	public function sendTo($email, $subject, $view, $data = [])
+	public function sendTo($toEmail, $fromEmail, $subject, $view, $data = [])
 	{
 		$views = [
 			'html' => 'emails.'.$view.'_html',
 			'text' => 'emails.'.$view.'_text'
 		];
 		
-		Mail::queue($views, $data, function($message) use ($email, $subject)
+		Mail::queue($views, $data, function($message) use ($toEmail, $fromEmail, $subject)
 		{
-			$message->to($email)->subject($subject);
+			$message->to($toEmail)->replyTo($fromEmail)->subject($subject);
 		});
 	}
 }
\ No newline at end of file
diff --git a/app/ninja/mailers/UserMailer.php b/app/ninja/mailers/UserMailer.php
index 5331d77a818c..f8905e250f8c 100755
--- a/app/ninja/mailers/UserMailer.php
+++ b/app/ninja/mailers/UserMailer.php
@@ -18,6 +18,6 @@ class UserMailer extends Mailer {
 		$data = [];
 		$subject = 'Notification - Invoice ' . $type;
 
-		$this->sendTo($user->email, $subject, $view, $data);
+		$this->sendTo($user->email, CONTACT_EMAIL, $subject, $view, $data);
 	}
 }
\ No newline at end of file
diff --git a/app/routes.php b/app/routes.php
index 192f9abb36da..3d6e21b8814e 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -131,6 +131,7 @@ HTML::macro('image_data', function($imagePath) {
 });
 
 
+define('CONTACT_EMAIL', 'contact@invoiceninja.com')
 
 define("ENV_DEVELOPMENT", "local");
 define("ENV_STAGING", "staging");
diff --git a/bootstrap/start.php b/bootstrap/start.php
index 4616ba60dcd0..762ae1ddd31e 100755
--- a/bootstrap/start.php
+++ b/bootstrap/start.php
@@ -61,9 +61,17 @@ $app = new Illuminate\Foundation\Application;
 */
 
 
+$env = $app->detectEnvironment(function ()
+{
+    return require __DIR__.'/environment.php';
+});
+
+
+/*
 $env = $app->detectEnvironment(function () {
     return isset($_SERVER['LARAVEL_ENV']) ? $_SERVER['LARAVEL_ENV'] : 'development';
 });
+*/
 
 /*
 $env = $app->detectEnvironment(array(