diff --git a/.gitignore b/.gitignore
index 39498b28e145..04ca0e2494a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ local_version.txt
 
 /resources/assets/bower
 /public/logo
-
+/storage/*
 .env.dusk.local
 /public/vendors/*
 *.log
diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php
index 7aaedccff532..a1fe1ca162fe 100644
--- a/app/Mail/BouncedEmail.php
+++ b/app/Mail/BouncedEmail.php
@@ -45,7 +45,7 @@ class BouncedEmail extends Mailable implements ShouldQueue
         $subject = ctrans("texts.notification_{$entity_type}_bounced_subject", ['invoice' => $invoice->number]);
         
         return
-            $this->from(config('mail.from.name'), config('mail.from.address'))
+            $this->from(config('mail.from.address'), config('mail.from.name'))
                 ->text()
                 ->subject($subject);
 
diff --git a/app/Mail/DownloadInvoices.php b/app/Mail/DownloadInvoices.php
index 2c65d34ee125..e50bccaca845 100644
--- a/app/Mail/DownloadInvoices.php
+++ b/app/Mail/DownloadInvoices.php
@@ -31,7 +31,7 @@ class DownloadInvoices extends Mailable
     public function build()
     {
         
-        return $this->from(config('mail.from.name'), config('mail.from.address'))
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
             ->subject(ctrans('texts.download_files'))
             ->markdown(
                 'email.admin.download_files',
diff --git a/app/Mail/ExistingMigration.php b/app/Mail/ExistingMigration.php
index 596947b7fcab..980a62a799bc 100644
--- a/app/Mail/ExistingMigration.php
+++ b/app/Mail/ExistingMigration.php
@@ -28,7 +28,7 @@ class ExistingMigration extends Mailable
     public function build()
     {
 
-        return $this->from(config('mail.from.name'), config('mail.from.address'))
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->view('email.migration.existing');
     }
 }
diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php
index 358a15a6c3bc..301b91c60ca3 100644
--- a/app/Mail/MigrationCompleted.php
+++ b/app/Mail/MigrationCompleted.php
@@ -29,7 +29,7 @@ class MigrationCompleted extends Mailable
     {
         $data['settings'] = auth()->user()->company()->settings;
 
-        return $this->from(config('mail.from.name'), config('mail.from.address'))
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->view('email.migration.completed', $data);
     }
 }
diff --git a/app/Mail/MigrationFailed.php b/app/Mail/MigrationFailed.php
index 545736fd0bf3..c44aa461a87d 100644
--- a/app/Mail/MigrationFailed.php
+++ b/app/Mail/MigrationFailed.php
@@ -32,7 +32,7 @@ class MigrationFailed extends Mailable
     public function build()
     {
         
-        return $this->from(config('mail.from.name'), config('mail.from.address'))
+        return $this->from(config('mail.from.address'), config('mail.from.name'))
                     ->view('email.migration.failed');
     }
 }