diff --git a/templates/conversations/conversation.html b/templates/conversations/conversation.html
index 9cb878a..39b83cb 100644
--- a/templates/conversations/conversation.html
+++ b/templates/conversations/conversation.html
@@ -177,6 +177,9 @@
                                 <input type="file" id="fileInput" class="d-none" multiple accept=".pdf,.docx,.doc,.txt,.rtf,.odt,.md,.csv,.xlsx,.xls,.ods,.xlsm,.pptx,.ppt,.odp,.jpg,.jpeg,.png,.gif,.bmp,.svg,.webp,.tiff,.zip,.rar,.7z,.tar,.gz,.py,.js,.html,.css,.json,.xml,.sql,.sh,.bat,.mp3,.wav,.ogg,.m4a,.flac,.mp4,.avi,.mov,.wmv,.flv,.mkv,.webm,.dwg,.dxf,.ai,.psd,.eps,.indd,.eml,.msg,.vcf,.ics">
                                 <button type="submit" class="btn btn-primary d-flex align-items-center justify-content-center" style="height: 38px; width: 38px;">
                                     <i class="fas fa-paper-plane"></i>
+                                    <div class="spinner-border spinner-border-sm text-light ms-1 d-none" role="status" style="width: 1rem; height: 1rem;">
+                                        <span class="visually-hidden">Sending...</span>
+                                    </div>
                                 </button>
                             </div>
                             <div class="d-flex align-items-center" style="min-height: 1.2em;">
@@ -659,6 +662,8 @@ $(document).ready(function() {
 
         const messageInput = $('#messageInput');
         const submitButton = $('#messageForm button[type="submit"]');
+        const submitIcon = submitButton.find('.fa-paper-plane');
+        const spinner = submitButton.find('.spinner-border');
         const message = messageInput.val().trim();
         const fileInput = $('#fileInput')[0];
         const files = Array.from(fileInput.files);
@@ -678,6 +683,8 @@ $(document).ready(function() {
         isSubmitting = true;
         messageInput.prop('disabled', true);
         submitButton.prop('disabled', true);
+        submitIcon.addClass('d-none');
+        spinner.removeClass('d-none');
 
         const formData = new FormData();
         formData.append('message', message);
@@ -726,6 +733,8 @@ $(document).ready(function() {
             complete: function() {
                 messageInput.prop('disabled', false);
                 submitButton.prop('disabled', false);
+                submitIcon.removeClass('d-none');
+                spinner.addClass('d-none');
                 isSubmitting = false;
             }
         });