From ff998a8bd1681343ee9db79c0887ffa0378ce8f8 Mon Sep 17 00:00:00 2001
From: Tiktack <aleh.khantsevich@gmail.com>
Date: Sun, 3 Nov 2024 15:45:10 +0100
Subject: [PATCH] Fix for To/Cc/Bcc alignment and crush when opening eml 
 (#449)

* Add margin to To/Cc/Bcc

* Fix crash when opening eml

* Remove useless top
---
 Wino.Mail.ViewModels/MailRenderingPageViewModel.cs | 2 +-
 Wino.Mail/Views/MailRenderingPage.xaml             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
index 7be04640..29664291 100644
--- a/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
+++ b/Wino.Mail.ViewModels/MailRenderingPageViewModel.cs
@@ -467,7 +467,7 @@ namespace Wino.Mail.ViewModels
                         ?? new AccountContact() { Name = mailboxAddress.Name, Address = mailboxAddress.Address };
 
                     // Make sure that user account first in the list.
-                    if (foundContact.Address == initializedMailItemViewModel.AssignedAccount.Address)
+                    if (foundContact.Address == initializedMailItemViewModel?.AssignedAccount?.Address)
                     {
                         accounts.Insert(0, foundContact);
                     }
diff --git a/Wino.Mail/Views/MailRenderingPage.xaml b/Wino.Mail/Views/MailRenderingPage.xaml
index 3934ab63..999c88c4 100644
--- a/Wino.Mail/Views/MailRenderingPage.xaml
+++ b/Wino.Mail/Views/MailRenderingPage.xaml
@@ -277,6 +277,7 @@
                             </Grid.ColumnDefinitions>
 
                             <TextBlock
+                                Margin="0,1,0,0"
                                 VerticalAlignment="Top"
                                 FontWeight="SemiBold"
                                 Text="{x:Bind domain:Translator.ComposerTo}"
@@ -300,6 +301,7 @@
                                 <ColumnDefinition Width="*" />
                             </Grid.ColumnDefinitions>
                             <TextBlock
+                                Margin="0,1,0,0"
                                 VerticalAlignment="Top"
                                 FontWeight="SemiBold"
                                 Text="Cc:"
@@ -323,6 +325,7 @@
                             </Grid.ColumnDefinitions>
 
                             <TextBlock
+                                Margin="0,1,0,0"
                                 VerticalAlignment="Top"
                                 FontWeight="SemiBold"
                                 Text="Bcc:"