diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor
index c1fc7554..8ef75219 100644
--- a/TIAMSharedUI/Pages/EditTransfers.razor
+++ b/TIAMSharedUI/Pages/EditTransfers.razor
@@ -104,7 +104,7 @@ else if (!string.IsNullOrEmpty(_errorMessage))
 else
 {
     <div class="container mt-4">
-        <DxTabs>
+        <DxTabs ActiveTabIndex="@activeTab">
             <DxTabPage Visible="@displayCard" Text="Details">
 
 
@@ -167,12 +167,12 @@ else
 
                                         <div class="card-footer p-4">
                                             <div class="d-flex justify-content-between align-items-center">
-                                                <h5 class="fw-normal mb-0"><a href="#!" class="text-decoration-none">Contact driver</a></h5>
+                                                <DxButton RenderStyle="ButtonRenderStyle.Warning" Click="OpenMessages">Contact driver</DxButton>
                                                 <div class="vr"></div>
                                                 @{
                                                     if (_transfer.TransferStatusType != TransferStatusType.UserCanceled)
                                                     {
-                                                        <h5 class="fw-normal mb-0"><DxButton RenderStyle="ButtonRenderStyle.Warning" Click="CancelTransfer">Cancel</DxButton></h5>
+                                                        <DxButton RenderStyle="ButtonRenderStyle.Warning" Click="CancelTransfer">Cancel</DxButton>
                                                     }
                                                 }
 
@@ -186,7 +186,7 @@ else
                                                 }
 
                                                 @*<h5 class="fw-normal mb-0"><a class="btn btn-secondary" @onclick="SetEditMode">Modify</a></h5>*@
-                                                <h5 class="fw-normal mb-0"><DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="SetEditMode">Modify</DxButton></h5>
+                                                <DxButton RenderStyle="ButtonRenderStyle.Secondary" Click="SetEditMode">Modify</DxButton>
                                             </div>
                                         </div>
                                     </div>
@@ -292,6 +292,7 @@ else
             <DxTabPage Visible="@displayCard" Text="Messages">
                 <div style="margin-top: 10px; margin-bottom: 10px;">
                     <DxButton Click="() => SendMail(_transfer)" Text="Send a message" RenderStyle="ButtonRenderStyle.Primary" />
+                    <DxButton RenderStyle="ButtonRenderStyle.Warning" Click="OpenDetails">Back to transfer</DxButton>
                 </div>
                 <MessageDetailGridComponent ContextId="_transfer.Id" GetAllMessageTag="SignalRTags.GetMessagesByContextId" IsSenderEmailVisible="false" IsMessageTextVisible="false"></MessageDetailGridComponent>
             </DxTabPage>           
@@ -336,6 +337,8 @@ else
     private bool _editMode = false;
     private readonly List<string> _statusTypes = [];
 
+    private int activeTab = 0;
+
     void SendMail(Transfer item)
     {
         _logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
@@ -397,6 +400,16 @@ else
         var result = await UpdateTransfer(true);
     }
 
+    private void OpenMessages()
+    {
+        activeTab = 1;
+    }
+
+    private void OpenDetails()
+    {
+        activeTab = 0;
+    }
+
     private async Task Pay()
     {
         if (_transfer != null)