diff --git a/Wino.Core.Domain/Translations/en_US/resources.json b/Wino.Core.Domain/Translations/en_US/resources.json
index b190a618..0420f72d 100644
--- a/Wino.Core.Domain/Translations/en_US/resources.json
+++ b/Wino.Core.Domain/Translations/en_US/resources.json
@@ -611,6 +611,6 @@
     "TitleBarServerDisconnectedButton_Title": "no connection",
     "TitleBarServerDisconnectedButton_Description": "Wino is disconnected from the network. Click reconnect to restore connection.",
     "TitleBarServerReconnectButton_Title": "reconnect",
-    "TitleBarServerReconnectingButton_Title": "connecting"
-
+    "TitleBarServerReconnectingButton_Title": "connecting",
+    "MailItemNoSubject": "No subject"
 }
diff --git a/Wino.Core.Domain/Translator.Designer.cs b/Wino.Core.Domain/Translator.Designer.cs
index 2a1dbcaa..2f7800fe 100644
--- a/Wino.Core.Domain/Translator.Designer.cs
+++ b/Wino.Core.Domain/Translator.Designer.cs
@@ -3082,5 +3082,10 @@ namespace Wino.Core.Domain
 		/// connecting
 		/// </summary>
 		public static string TitleBarServerReconnectingButton_Title => Resources.GetTranslatedString(@"TitleBarServerReconnectingButton_Title");	
+	
+        /// <summary>
+		/// No subject
+		/// </summary>
+		public static string MailItemNoSubject => Resources.GetTranslatedString(@"MailItemNoSubject");	
 	}
 }
diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
index d60d9602..c5f01fd5 100644
--- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
+++ b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
@@ -119,7 +119,7 @@
                                 x:Name="SenderTextFromAddress"
                                 Grid.Column="1"
                                 Text="{x:Bind MailItem.FromAddress}"
-                                TextTrimming="WordEllipsis"
+                                TextTrimming="CharacterEllipsis"
                                 Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" />
 
                             <!--  Hover button  -->
@@ -193,7 +193,7 @@
                                 x:Name="TitleText"
                                 Grid.Column="1"
                                 MaxLines="1"
-                                Text="{x:Bind MailItem.Subject}"
+                                Text="{x:Bind helpers:XamlHelpers.GetMailItemSubject(MailItem.Subject)}"
                                 TextTrimming="CharacterEllipsis" />
 
                             <TextBlock
diff --git a/Wino.Mail/Helpers/XamlHelpers.cs b/Wino.Mail/Helpers/XamlHelpers.cs
index f664aacc..627db531 100644
--- a/Wino.Mail/Helpers/XamlHelpers.cs
+++ b/Wino.Mail/Helpers/XamlHelpers.cs
@@ -57,6 +57,7 @@ namespace Wino.Helpers
                 return prefer24HourTime ? localTime.ToString(TwentyFourHourTimeFormat) : localTime.ToString(TwelveHourTimeFormat);
             }
         }
+        public static string GetMailItemSubject(string subject) => string.IsNullOrWhiteSpace(subject) ? $"({Translator.MailItemNoSubject})" : subject;
         public static string GetCreationDateString(DateTime date, bool prefer24HourTime)
         {
             var localTime = date.ToLocalTime();
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index dd95013d..3934ab63 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -179,7 +179,8 @@
                         VerticalAlignment="Center"
                         FontSize="18"
                         FontWeight="SemiBold"
-                        Text="{x:Bind ViewModel.Subject, Mode=OneWay}"
+                        IsTextSelectionEnabled="True"
+                        Text="{x:Bind helpers:XamlHelpers.GetMailItemSubject( ViewModel.Subject), Mode=OneWay}"
                         TextWrapping="Wrap" />
 
                     <HyperlinkButton