diff --git a/public/css/app.css b/public/css/app.css
index 0c0b68544..0a9db28fa 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -65180,14 +65180,14 @@ body{
     color: rgb(85 88 139 / var(--tw-text-opacity));
   }
 
-  :is([dir="ltr"] .sm\:ltr\:right-4){
-    right: 1rem;
-  }
-
   :is([dir="ltr"] .sm\:ltr\:left-4){
     left: 1rem;
   }
 
+  :is([dir="ltr"] .sm\:ltr\:right-4){
+    right: 1rem;
+  }
+
   :is([dir="ltr"] .sm\:ltr\:pl-10){
     padding-left: 2.5rem;
   }
diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index 5b3965e63..37721aeb3 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -1011,7 +1011,7 @@ export default {
 
                 this.component = Vue.component('add-new-component', (resolve, reject) => {
                     resolve({
-                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
+                        template: '<div id="dynamic-email-component"><akaunting-modal-add-new modal-dialog-class="max-w-screen-md" modal-position-top :show="email.modal" @submit="onSubmit" @cancel="onCancel" :buttons="email.buttons" :title="email.title" :is_component=true :message="email.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             AkauntingDropzoneFileUpload,
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index a1be6d75b..c9d3fe3d6 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -621,6 +621,7 @@ const app = new Vue({
         onChangeCurrency(currency_code) {
             if (this.edit.status && this.edit.currency <= 2) {
                 this.edit.currency++;
+
                 return;
             }
 
diff --git a/resources/assets/js/views/settings/settings.js b/resources/assets/js/views/settings/settings.js
index 7995f1969..5b6c5d181 100644
--- a/resources/assets/js/views/settings/settings.js
+++ b/resources/assets/js/views/settings/settings.js
@@ -141,7 +141,7 @@ const app = new Vue({
             });
         },
 
-        // Change currency get money
+        // Change currency get money override because remove form currency_code and currency_rate column
         onChangeCurrency(currency_code) {
             if (! currency_code) {
                 return;
diff --git a/resources/lang/en-GB/documents.php b/resources/lang/en-GB/documents.php
index 81ecb7ea1..0555c7146 100644
--- a/resources/lang/en-GB/documents.php
+++ b/resources/lang/en-GB/documents.php
@@ -89,4 +89,5 @@ return [
         ],
     ],
 
+    'empty_attachments'         => 'There are no files attached to this :type.',
 ];
diff --git a/resources/views/modals/invoices/email.blade.php b/resources/views/modals/invoices/email.blade.php
index db03c2da4..ff39d118e 100644
--- a/resources/views/modals/invoices/email.blade.php
+++ b/resources/views/modals/invoices/email.blade.php
@@ -1,15 +1,13 @@
 <x-form id="form-email" :route="[$store_route, $invoice->id]">
-    <x-tabs active="general" class="grid grid-cols-{{ $invoice->attachment ? '2' : '1' }}" override="class" ignore-hash>
+    <x-tabs active="general" class="grid grid-cols-2 auto-rows-max" override="class" ignore-hash>
         <x-slot name="navs">
             <x-tabs.nav id="general">
                 {{ trans('general.general') }}
             </x-tabs.nav>
 
-            @if ($invoice->attachment)
-                <x-tabs.nav id="attachments">
-                    {{ trans_choice('general.attachments', 2) }}
-                </x-tabs.nav>
-            @endif
+            <x-tabs.nav id="attachments">
+                {{ trans_choice('general.attachments', 2) }}
+            </x-tabs.nav>
         </x-slot>
 
         <x-slot name="content">
@@ -29,8 +27,8 @@
                 </x-form.section>
             </x-tabs.tab>
 
-            @if ($invoice->attachment)
-                <x-tabs.tab id="attachments">
+            <x-tabs.tab id="attachments">
+                @if ($invoice->attachment)
                     <x-table>
                         <x-table.thead>
                             <x-table.tr class="flex items-center px-1">
@@ -55,11 +53,11 @@
                                 <x-table.tr id="method-{{ $attachment->id }}">
                                     <x-table.td class="w-1/12">
                                         <input type="checkbox"
-                                               id="attachment-{{ $attachment->id }}"
-                                               name="{{ $attachment->id }}"
-                                               class="rounded-sm text-purple border-gray-300 cursor-pointer disabled:bg-gray-200 focus:outline-none focus:ring-transparent"
-                                               data-field="attachments"
-                                               @input="e => form.attachments[e.target.name] = e.target.checked | 0">
+                                            id="attachment-{{ $attachment->id }}"
+                                            name="{{ $attachment->id }}"
+                                            class="rounded-sm text-purple border-gray-300 cursor-pointer disabled:bg-gray-200 focus:outline-none focus:ring-transparent"
+                                            data-field="attachments"
+                                            @input="e => form.attachments[e.target.name] = e.target.checked | 0">
                                     </x-table.td>
                                     <x-table.td class="w-1/6">
                                         @if ($attachment->aggregate_type == 'image')
@@ -84,8 +82,12 @@
                             @endforeach
                         </x-table.tbody>
                     </x-table>
-                </x-tabs.tab>
-            @endif
+                @else
+                    <p class="mt-6 text-sm">
+                        {{ trans('documents.empty_attachments', ['type' => $invoice->type]) }}
+                    </p>
+                @endif
+            </x-tabs.tab>
         </x-slot>
     </x-tabs>
 </x-form>