diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php
index 95d9bc55e434..9df8d9e79d82 100644
--- a/app/lang/da/texts.php
+++ b/app/lang/da/texts.php
@@ -577,5 +577,6 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
-  
+  'converted' => 'Converted',
+    
 );
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index c5bad5e52b8d..87de74960d85 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -568,5 +568,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
 
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index d51f8d57d6ef..50727cfdd6c2 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -575,6 +575,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
   
   
 );
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index 72ecabaecddc..5d5a04863c32 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -547,6 +547,8 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
 
 
 );
\ No newline at end of file
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index 859397a224e0..9c78aa59e0ff 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -568,5 +568,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
 
 );
\ No newline at end of file
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index 04146d23af11..b3c96be0a247 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -570,5 +570,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
     
 );
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index 6a071202257b..81cfdee8f893 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -578,6 +578,8 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
 
     
 );
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index ff3921d026c7..2d066fc016d7 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -576,5 +576,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
   
 );
\ No newline at end of file
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index 3880755f71e6..45304e64b143 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -571,6 +571,8 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
 
   
 );
\ No newline at end of file
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index 61c16d760062..47ff16ff5dd6 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -559,5 +559,7 @@ return array(
   'password_recovery' => 'Password Recovery',
   'send_email' => 'Send email',
   'set_password' => 'Set Password',
+  'converted' => 'Converted',
+    
   
 );
diff --git a/app/ninja/mailers/Mailer.php b/app/ninja/mailers/Mailer.php
index bb451156bc0e..16264d91cc55 100755
--- a/app/ninja/mailers/Mailer.php
+++ b/app/ninja/mailers/Mailer.php
@@ -20,6 +20,7 @@ class Mailer
                 $fromEmail = NINJA_FROM_EMAIL;
             }
 
+            //$message->setEncoder(\Swift_Encoding::get8BitEncoding());
             $message->to($toEmail)->from($fromEmail, $fromName)->replyTo($replyEmail, $fromName)->subject($subject);
         });
     }
diff --git a/app/ninja/repositories/InvoiceRepository.php b/app/ninja/repositories/InvoiceRepository.php
index 5d6a85790f0c..c364cb569b9c 100755
--- a/app/ninja/repositories/InvoiceRepository.php
+++ b/app/ninja/repositories/InvoiceRepository.php
@@ -126,7 +126,7 @@ class InvoiceRepository
         }
 
         return $table->addColumn('due_date', function ($model) { return Utils::fromSqlDate($model->due_date); })
-        ->addColumn('invoice_status_name', function ($model) { return $model->invoice_status_name; })
+        ->addColumn('invoice_status_name', function ($model) { return $model->quote_invoice_id ? link_to("invoices/{$model->quote_invoice_id}/edit", trans('texts.converted')) : $model->invoice_status_name; })
         ->addColumn('dropdown', function ($model) use ($entityType) {
 
             if ($model->is_deleted) {
diff --git a/app/views/emails/confirm_html.blade.php b/app/views/emails/confirm_html.blade.php
index c482b0fa841a..5f617f17317a 100755
--- a/app/views/emails/confirm_html.blade.php
+++ b/app/views/emails/confirm_html.blade.php
@@ -1,33 +1,32 @@
 <html>
-  <body>
-    <script type="application/ld+json">
+<body>
+  <script type="application/ld+json">
     {
-      "@context":"http://schema.org",
-      "@type":"EmailMessage",
-      "description":"Confirm your Invoice Ninja account",
-      "action":
-      {
-        "@type":"ConfirmAction",
-        "name":"Confirm Account",
+      "@context": "http://schema.org",
+      "@type": "EmailMessage",
+      "action": {
+        "@type": "ConfirmAction",
+        "name": "Approve Expense",
         "handler": {
           "@type": "HttpActionHandler",
-          "url": "{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}"
-        }    
+          "url": "https://myexpenses.com/approve?expenseId=abc123"
       }
-    }
-    </script>
+  },
+  "description": "Approval request for John's $10.13 expense for office supplies"
+}
+</script>
 
-    <h1>{{ trans('texts.confirmation_header') }}</h1>
+<h1>{{ trans('texts.confirmation_header') }}</h1>
 
-    <p>
-      {{ $invitationMessage . trans('texts.confirmation_message') }}<br/>
-      <a href='{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}'>
-          {{{ URL::to("user/confirm/{$user->confirmation_code}") }}}
-      </a>
-    <p/>
+<p>
+  {{ $invitationMessage . trans('texts.confirmation_message') }}<br/>
+  <a href='{{{ URL::to("user/confirm/{$user->confirmation_code}") }}}'>
+      {{{ URL::to("user/confirm/{$user->confirmation_code}") }}}
+  </a>
+  <p/>
 
-    {{ trans('texts.email_signature') }}<br/>
-    {{ trans('texts.email_from') }}
+  {{ trans('texts.email_signature') }}<br/>
+  {{ trans('texts.email_from') }}
 
-  </body>
+</body>
 </html>
\ No newline at end of file
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index 7b5e9f632ea2..93a6e3da8f7a 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -176,17 +176,17 @@
                     <div class="tab-content">
                         <div role="tabpanel" class="tab-pane active" id="notes" style="padding-bottom:44px">
                             {{ Former::textarea('public_notes')->data_bind("value: wrapped_notes, valueUpdate: 'afterkeydown'")
-                            ->label(null)->style('resize: none; min-width: 460px;')->rows(3) }}                            
+                            ->label(null)->style('resize: none; min-width: 450px;')->rows(3) }}                            
                         </div>
                         <div role="tabpanel" class="tab-pane" id="terms">
                             {{ Former::textarea('terms')->data_bind("value:wrapped_terms, placeholder: default_terms, valueUpdate: 'afterkeydown'")
-                            ->label(false)->style('resize: none; min-width: 460px')->rows(3)
+                            ->label(false)->style('resize: none; min-width: 450px')->rows(3)
                             ->help('<label class="checkbox" style="width: 200px">
                                         <input type="checkbox" style="width: 24px" data-bind="checked: set_default_terms"/>'.trans('texts.save_as_default_terms').'</label>') }}
                         </div>
                         <div role="tabpanel" class="tab-pane" id="footer">
                             {{ Former::textarea('invoice_footer')->data_bind("value:wrapped_footer, placeholder: default_footer, valueUpdate: 'afterkeydown'")
-                            ->label(false)->style('resize: none; min-width: 460px')->rows(3)
+                            ->label(false)->style('resize: none; min-width: 450px')->rows(3)
                             ->help('<label class="checkbox" style="width: 200px">
                                         <input type="checkbox" style="width: 24px" data-bind="checked: set_default_footer"/>'.trans('texts.save_as_default_footer').'</label>') }}
                         </div>
@@ -300,7 +300,7 @@
 		@if (!$invoice || (!$invoice->trashed() && !$invoice->client->trashed()))
 			@if ($invoice && $invoice->id)		
 
-				<div id="primaryActions" style="text-align:left" class="btn-group">
+				<div id="primaryActions" style="text-align:left" class="btn-group dropup">
 					<button class="btn-success btn" type="button">{{ trans("texts.save_{$entityType}") }}</button>
 					<button class="btn-success btn dropdown-toggle" type="button" data-toggle="dropdown"> 
 						<span class="caret"></span>