diff --git a/Wino.Core.Domain/Entities/AccountContact.cs b/Wino.Core.Domain/Entities/AccountContact.cs
index 7585d8e0..d3b9f081 100644
--- a/Wino.Core.Domain/Entities/AccountContact.cs
+++ b/Wino.Core.Domain/Entities/AccountContact.cs
@@ -36,7 +36,7 @@ namespace Wino.Core.Domain.Entities
         /// </summary>
         public bool IsRootContact { get; set; }
 
-        public string DisplayName => Address == Name ? Address : $"{Name} <{Address}>";
+        public string DisplayName => Address == Name || string.IsNullOrWhiteSpace(Name) ? Address.ToLowerInvariant() : $"{Name} <{Address.ToLowerInvariant()}>";
 
         public override bool Equals(object obj)
         {
diff --git a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
index 307b111a..d60d9602 100644
--- a/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
+++ b/Wino.Mail/Controls/MailItemDisplayInformationControl.xaml
@@ -108,10 +108,19 @@
 
                             <!--  Sender  -->
                             <TextBlock
-                                x:Name="SenderText"
+                                x:Name="SenderTextFromName"
                                 Grid.Column="1"
                                 Text="{x:Bind MailItem.FromName}"
-                                TextTrimming="WordEllipsis" />
+                                TextTrimming="WordEllipsis"
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(MailItem.FromName)}" />
+
+                            <!--  Sender  -->
+                            <TextBlock
+                                x:Name="SenderTextFromAddress"
+                                Grid.Column="1"
+                                Text="{x:Bind MailItem.FromAddress}"
+                                TextTrimming="WordEllipsis"
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" />
 
                             <!--  Hover button  -->
                             <StackPanel
@@ -252,7 +261,8 @@
                     <VisualState.Setters>
                         <Setter Target="TitleText.Foreground" Value="{ThemeResource SystemAccentColor}" />
                         <Setter Target="TitleText.FontWeight" Value="Semibold" />
-                        <Setter Target="SenderText.FontWeight" Value="Semibold" />
+                        <Setter Target="SenderTextFromName.FontWeight" Value="Semibold" />
+                        <Setter Target="SenderTextFromAddress.FontWeight" Value="Semibold" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="Read" />
diff --git a/Wino.Mail/Helpers/XamlHelpers.cs b/Wino.Mail/Helpers/XamlHelpers.cs
index 4e9bc4da..f664aacc 100644
--- a/Wino.Mail/Helpers/XamlHelpers.cs
+++ b/Wino.Mail/Helpers/XamlHelpers.cs
@@ -44,9 +44,8 @@ namespace Wino.Helpers
         public static Visibility IsSelectionModeMultiple(ListViewSelectionMode mode) => mode == ListViewSelectionMode.Multiple ? Visibility.Visible : Visibility.Collapsed;
         public static FontWeight GetFontWeightBySyncState(bool isSyncing) => isSyncing ? FontWeights.SemiBold : FontWeights.Normal;
         public static FontWeight GetFontWeightByChildSelectedState(bool isChildSelected) => isChildSelected ? FontWeights.SemiBold : FontWeights.Normal;
-        public static Geometry GetPathIcon(string resourceName) => GetPathGeometry(Application.Current.Resources[$"{resourceName}"] as string);
-        public static GridLength GetGridLength(double width) => new GridLength(width, GridUnitType.Pixel);
-        public static double MailListAdaptivityConverter(double mailListPaneLength) => mailListPaneLength + 300d;
+        public static Visibility StringToVisibilityConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible;
+        public static Visibility StringToVisibilityReversedConverter(string value) => string.IsNullOrWhiteSpace(value) ? Visibility.Visible : Visibility.Collapsed;
         public static string GetMailItemDisplaySummaryForListing(bool isDraft, DateTime receivedDate, bool prefer24HourTime)
         {
             if (isDraft)
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index 5d3002d4..d521ea0f 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -208,10 +208,15 @@
                                         Command="{Binding ElementName=root, Path=ViewModel.CopyClipboardCommand}"
                                         CommandParameter="{x:Bind ViewModel.FromAddress, Mode=OneWay}"
                                         FontWeight="SemiBold">
-                                        <TextBlock>
-                                            <Run Text="{x:Bind ViewModel.FromName, Mode=OneWay}" />
-                                            <Run Text="&lt;" /><Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" /><Run Text="&gt;" />
-                                        </TextBlock>
+                                        <Grid>
+                                            <TextBlock Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(ViewModel.FromName), Mode=OneWay}">
+                                                <Run Text="{x:Bind ViewModel.FromName, Mode=OneWay}" />
+                                                <Run Text="&lt;" /><Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" /><Run Text="&gt;" />
+                                            </TextBlock>
+                                            <TextBlock Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(ViewModel.FromName), Mode=OneWay}">
+                                                <Run Text="{x:Bind ViewModel.FromAddress, Mode=OneWay}" />
+                                            </TextBlock>
+                                        </Grid>
                                     </HyperlinkButton>
                                     <TextBlock FontSize="12" Text="{x:Bind helpers:XamlHelpers.GetCreationDateString(ViewModel.CreationDate, ViewModel.PreferencesService.Prefer24HourTimeFormat), Mode=OneWay}" />
                                 </StackPanel>