diff --git a/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs b/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
index d9b983d8..262d68a8 100644
--- a/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
+++ b/Wino.Mail.ViewModels/Data/AccountContactViewModel.cs
@@ -18,17 +18,22 @@ public class AccountContactViewModel : AccountContact
     /// </summary>
     public bool IsMe { get; set; }
 
+    /// <summary>
+    /// Gets or sets whether the ShortNameOrYOu should have semicolon.
+    /// </summary>
+    public bool IsSemicolon { get; set; } = true;
+
     /// <summary>
     /// Provides a short name of the contact.
     /// <see cref="ShortDisplayName"/> or "You"
     /// </summary>
-    public string ShortNameOrYou => IsMe ? $"{Translator.AccountContactNameYou};" : ShortDisplayName;
+    public string ShortNameOrYou => (IsMe ? Translator.AccountContactNameYou : ShortDisplayName) + (IsSemicolon ? ";" : string.Empty);
 
     /// <summary>
     /// Short display name of the contact.
     /// Either Name or Address.
     /// </summary>
-    public string ShortDisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? $"{Address.ToLowerInvariant()};" : $"{Name};";
+    public string ShortDisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? $"{Address.ToLowerInvariant()}" : $"{Name}";
 
     /// <summary>
     /// Display name of the contact in a format: Name <Address>.
diff --git a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
index 13cbba42..e55fb1c4 100644
--- a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
@@ -494,6 +494,9 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
             }
         }
 
+        if (accounts.Count > 0)
+            accounts[^1].IsSemicolon = false;
+
         return accounts;
     }