Item vm prop changes.

2025-10-28 14:43:22 +01:00
parent c461a4daed
commit d02205fba3
11 changed files with 346 additions and 2005 deletions
@@ -340,7 +340,7 @@ public sealed partial class AppShell : AppShellAbstract,
    protected override void RegisterRecipients()
    {
        base.RegisterRecipients();
-        
+
        WeakReferenceMessenger.Default.Register<InfoBarMessageRequested>(this);
        WeakReferenceMessenger.Default.Register<AccountMenuItemExtended>(this);
        WeakReferenceMessenger.Default.Register<CreateNewMailWithMultipleAccountsRequested>(this);
@@ -350,7 +350,7 @@ public sealed partial class AppShell : AppShellAbstract,
    protected override void UnregisterRecipients()
    {
        base.UnregisterRecipients();
-        
+
        WeakReferenceMessenger.Default.Unregister<InfoBarMessageRequested>(this);
        WeakReferenceMessenger.Default.Unregister<AccountMenuItemExtended>(this);
        WeakReferenceMessenger.Default.Unregister<CreateNewMailWithMultipleAccountsRequested>(this);
@@ -49,7 +49,7 @@
                    VerticalAlignment="Top"
                    Canvas.ZIndex="0"
                    Fill="{ThemeResource SystemAccentColor}"
-                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(MailItem.IsRead), Mode=OneWay}" />
+                    Visibility="{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(IsRead), Mode=OneWay}" />
            </Grid>


@@ -73,9 +73,9 @@
                    HorizontalAlignment="Center"
                    VerticalAlignment="Center"
                    FontSize="14"
-                    FromAddress="{x:Bind MailItem.FromAddress, Mode=OneWay}"
-                    FromName="{x:Bind MailItem.FromName, Mode=OneWay}"
-                    SenderContactPicture="{x:Bind MailItem.SenderContact.Base64ContactPicture}"
+                    FromAddress="{x:Bind FromAddress, Mode=OneWay}"
+                    FromName="{x:Bind FromName, Mode=OneWay}"
+                    SenderContactPicture="{x:Bind Base64ContactPicture, Mode=OneWay}"
                    ThumbnailUpdatedEvent="{x:Bind IsThumbnailUpdated, Mode=OneWay}"
                    Visibility="{x:Bind IsAvatarVisible, Mode=OneWay}" />

@@ -104,7 +104,7 @@
                            <TextBlock
                                x:Name="DraftTitle"
                                Margin="0,0,4,0"
-                                x:Load="{x:Bind MailItem.IsDraft, Mode=OneWay}"
+                                x:Load="{x:Bind IsDraft, Mode=OneWay}"
                                Foreground="{StaticResource DeleteBrush}">

                                <Run Text="[" /><Run Text="{x:Bind domain:Translator.Draft}" /><Run Text="]" /> <Run Text=" " />
@@ -114,17 +114,17 @@
                            <TextBlock
                                x:Name="SenderTextFromName"
                                Grid.Column="1"
-                                Text="{x:Bind MailItem.FromName}"
+                                Text="{x:Bind FromName}"
                                TextTrimming="WordEllipsis"
-                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(MailItem.FromName)}" />
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityConverter(FromName)}" />

                            <!--  Sender  -->
                            <TextBlock
                                x:Name="SenderTextFromAddress"
                                Grid.Column="1"
-                                Text="{x:Bind MailItem.FromAddress}"
+                                Text="{x:Bind FromAddress}"
                                TextTrimming="CharacterEllipsis"
-                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(MailItem.FromName)}" />
+                                Visibility="{x:Bind helpers:XamlHelpers.StringToVisibilityReversedConverter(FromName)}" />

                            <!--  Hover button  -->
                            <StackPanel
@@ -194,6 +194,7 @@
                                x:Name="TitleText"
                                Grid.Column="1"
                                MaxLines="1"
+                                Text="{x:Bind Subject, Mode=OneWay}"
                                TextTrimming="CharacterEllipsis" />

                            <TextBlock
@@ -203,7 +204,7 @@
                                VerticalAlignment="Center"
                                FontSize="11"
                                Opacity="0.7"
-                                Text="{x:Bind helpers:XamlHelpers.GetMailItemDisplaySummaryForListing(MailItem.IsDraft, MailItem.CreationDate, Prefer24HourTimeFormat)}" />
+                                Text="{x:Bind helpers:XamlHelpers.GetMailItemDisplaySummaryForListing(IsDraft, CreationDate, Prefer24HourTimeFormat)}" />
                        </Grid>

                        <!--  Message  -->
@@ -219,10 +220,10 @@
                            <Grid x:Name="PreviewTextContainer">
                                <TextBlock
                                    x:Name="PreviewTextblock"
-                                    x:Load="{x:Bind helpers:XamlHelpers.ShouldDisplayPreview(MailItem.PreviewText), Mode=OneWay}"
+                                    x:Load="{x:Bind helpers:XamlHelpers.ShouldDisplayPreview(PreviewText), Mode=OneWay}"
                                    MaxLines="1"
                                    Opacity="0.7"
-                                    Text="{x:Bind MailItem.PreviewText}"
+                                    Text="{x:Bind PreviewText}"
                                    TextTrimming="CharacterEllipsis" />
                            </Grid>

@@ -236,12 +237,12 @@

                                <ContentPresenter
                                    x:Name="HasAttachmentContent"
-                                    x:Load="{x:Bind MailItem.HasAttachments, Mode=OneWay}"
+                                    x:Load="{x:Bind HasAttachments, Mode=OneWay}"
                                    ContentTemplate="{StaticResource AttachmentSymbolControlTemplate}" />

                                <ContentPresenter
                                    x:Name="IsFlaggedContent"
-                                    x:Load="{x:Bind MailItem.IsFlagged, Mode=OneWay}"
+                                    x:Load="{x:Bind IsFlagged, Mode=OneWay}"
                                    ContentTemplate="{StaticResource FlaggedSymbolControlTemplate}" />
                            </StackPanel>
                        </Grid>
@@ -255,7 +256,7 @@
            <VisualStateGroup x:Name="ReadStates">
                <VisualState x:Name="Unread">
                    <VisualState.StateTriggers>
-                        <StateTrigger IsActive="{x:Bind MailItem.IsRead, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}" />
+                        <StateTrigger IsActive="{x:Bind IsRead, Converter={StaticResource ReverseBooleanConverter}, Mode=OneWay}" />
                    </VisualState.StateTriggers>

                    <VisualState.Setters>
@@ -1,13 +1,14 @@
-using System.Numerics;
+using System;
+using System.Linq;
+using System.Numerics;
 using System.Windows.Input;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Models.MailItem;
 using Wino.Extensions;
+using Wino.Mail.ViewModels.Data;

 namespace Wino.Controls;

@@ -17,116 +18,88 @@ public sealed partial class MailItemDisplayInformationControl : UserControl

    public bool IsRunningHoverAction { get; set; }

-    public static readonly DependencyProperty DisplayModeProperty = DependencyProperty.Register(nameof(DisplayMode), typeof(MailListDisplayMode), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailListDisplayMode.Spacious));
-    public static readonly DependencyProperty ShowPreviewTextProperty = DependencyProperty.Register(nameof(ShowPreviewText), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsAvatarVisibleProperty = DependencyProperty.Register(nameof(IsAvatarVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty IsSubjectVisibleProperty = DependencyProperty.Register(nameof(IsSubjectVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty ConnectedExpanderProperty = DependencyProperty.Register(nameof(ConnectedExpander), typeof(WinoExpander), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty LeftHoverActionProperty = DependencyProperty.Register(nameof(LeftHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty CenterHoverActionProperty = DependencyProperty.Register(nameof(CenterHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty RightHoverActionProperty = DependencyProperty.Register(nameof(RightHoverAction), typeof(MailOperation), typeof(MailItemDisplayInformationControl), new PropertyMetadata(MailOperation.None));
-    public static readonly DependencyProperty HoverActionExecutedCommandProperty = DependencyProperty.Register(nameof(HoverActionExecutedCommand), typeof(ICommand), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null));
-    public static readonly DependencyProperty MailItemProperty = DependencyProperty.Register(nameof(MailItem), typeof(MailCopy), typeof(MailItemDisplayInformationControl), new PropertyMetadata(null, new PropertyChangedCallback(OnMailItemChanged)));
-    public static readonly DependencyProperty IsHoverActionsEnabledProperty = DependencyProperty.Register(nameof(IsHoverActionsEnabled), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(true));
-    public static readonly DependencyProperty Prefer24HourTimeFormatProperty = DependencyProperty.Register(nameof(Prefer24HourTimeFormat), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThreadExpanderVisibleProperty = DependencyProperty.Register(nameof(IsThreadExpanderVisible), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThreadExpandedProperty = DependencyProperty.Register(nameof(IsThreadExpanded), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
-    public static readonly DependencyProperty IsThumbnailUpdatedProperty = DependencyProperty.Register(nameof(IsThumbnailUpdated), typeof(bool), typeof(MailItemDisplayInformationControl), new PropertyMetadata(false));
+    [GeneratedDependencyProperty(DefaultValue = MailListDisplayMode.Spacious)]
+    public partial MailListDisplayMode DisplayMode { get; set; }

-    public bool IsThumbnailUpdated
-    {
-        get { return (bool)GetValue(IsThumbnailUpdatedProperty); }
-        set { SetValue(IsThumbnailUpdatedProperty, value); }
-    }
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool ShowPreviewText { get; set; }

-    public bool IsThreadExpanded
-    {
-        get { return (bool)GetValue(IsThreadExpandedProperty); }
-        set { SetValue(IsThreadExpandedProperty, value); }
-    }
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsAvatarVisible { get; set; }

-    public bool IsThreadExpanderVisible
-    {
-        get { return (bool)GetValue(IsThreadExpanderVisibleProperty); }
-        set { SetValue(IsThreadExpanderVisibleProperty, value); }
-    }
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsSubjectVisible { get; set; }

-    public bool Prefer24HourTimeFormat
-    {
-        get { return (bool)GetValue(Prefer24HourTimeFormatProperty); }
-        set { SetValue(Prefer24HourTimeFormatProperty, value); }
-    }
+    #region Display Properties

-    public bool IsHoverActionsEnabled
-    {
-        get { return (bool)GetValue(IsHoverActionsEnabledProperty); }
-        set { SetValue(IsHoverActionsEnabledProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial string? Subject { get; set; }

-    public MailCopy MailItem
-    {
-        get { return (MailCopy)GetValue(MailItemProperty); }
-        set { SetValue(MailItemProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial string? FromName { get; set; }

-    public ICommand HoverActionExecutedCommand
-    {
-        get { return (ICommand)GetValue(HoverActionExecutedCommandProperty); }
-        set { SetValue(HoverActionExecutedCommandProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial string? FromAddress { get; set; }

-    public MailOperation LeftHoverAction
-    {
-        get { return (MailOperation)GetValue(LeftHoverActionProperty); }
-        set { SetValue(LeftHoverActionProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial string? PreviewText { get; set; }

-    public MailOperation CenterHoverAction
-    {
-        get { return (MailOperation)GetValue(CenterHoverActionProperty); }
-        set { SetValue(CenterHoverActionProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial bool IsRead { get; set; }

-    public MailOperation RightHoverAction
-    {
-        get { return (MailOperation)GetValue(RightHoverActionProperty); }
-        set { SetValue(RightHoverActionProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial bool IsDraft { get; set; }

-    public WinoExpander ConnectedExpander
-    {
-        get { return (WinoExpander)GetValue(ConnectedExpanderProperty); }
-        set { SetValue(ConnectedExpanderProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial bool HasAttachments { get; set; }

-    public bool IsSubjectVisible
-    {
-        get { return (bool)GetValue(IsSubjectVisibleProperty); }
-        set { SetValue(IsSubjectVisibleProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial bool IsFlagged { get; set; }

-    public bool IsAvatarVisible
-    {
-        get { return (bool)GetValue(IsAvatarVisibleProperty); }
-        set { SetValue(IsAvatarVisibleProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial DateTime CreationDate { get; set; }

+    [GeneratedDependencyProperty]
+    public partial string? Base64ContactPicture { get; set; }

-    public bool ShowPreviewText
-    {
-        get { return (bool)GetValue(ShowPreviewTextProperty); }
-        set { SetValue(ShowPreviewTextProperty, value); }
-    }
+    #endregion

-    public MailListDisplayMode DisplayMode
-    {
-        get { return (MailListDisplayMode)GetValue(DisplayModeProperty); }
-        set { SetValue(DisplayModeProperty, value); }
-    }
+    [GeneratedDependencyProperty]
+    public partial WinoExpander? ConnectedExpander { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation LeftHoverAction { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation CenterHoverAction { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = MailOperation.None)]
+    public partial MailOperation RightHoverAction { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial ICommand? HoverActionExecutedCommand { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = true)]
+    public partial bool IsHoverActionsEnabled { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool Prefer24HourTimeFormat { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool IsThreadExpanderVisible { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool IsThreadExpanded { get; set; }
+
+    [GeneratedDependencyProperty(DefaultValue = false)]
+    public partial bool IsThumbnailUpdated { get; set; }
+
+    [GeneratedDependencyProperty]
+    public partial IMailListItem? ActionItem { get; set; }

    public MailItemDisplayInformationControl()
    {
-        this.InitializeComponent();
+        InitializeComponent();

        var compositor = this.Visual().Compositor;

@@ -142,19 +115,9 @@ public sealed partial class MailItemDisplayInformationControl : UserControl
        RootContainerVisualWrapper.SizeChanged += (s, e) => leftBackgroundVisual.Size = e.NewSize.ToVector2();
    }

-    private static void OnMailItemChanged(DependencyObject obj, DependencyPropertyChangedEventArgs args)
+    partial void OnIsFlaggedChanged(bool newValue)
    {
-        if (obj is MailItemDisplayInformationControl control)
-        {
-            control.UpdateInformation();
-        }
-    }

-    private void UpdateInformation()
-    {
-        if (MailItem == null) return;
-
-        TitleText.Text = string.IsNullOrWhiteSpace(MailItem.Subject) ? Translator.MailItemNoSubject : MailItem.Subject;
    }

    private void ControlPointerEntered(object sender, Microsoft.UI.Xaml.Input.PointerRoutedEventArgs e)
@@ -179,14 +142,13 @@ public sealed partial class MailItemDisplayInformationControl : UserControl
    {
        IsRunningHoverAction = true;

-        MailOperationPreperationRequest package = null;
+        MailOperationPreperationRequest? package = null;

-        //if (MailItem is MailCopy mailCopy)
-        //    package = new MailOperationPreperationRequest(operation, mailCopy, toggleExecution: true);
-        //else if (MailItem is ThreadMailItemViewModel threadMailItemViewModel)
-        //    package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.GetMailCopies(), toggleExecution: true);
-        //else if (MailItem is ThreadMailItem threadMailItem)
-        //    package = new MailOperationPreperationRequest(operation, threadMailItem.ThreadItems.Cast<MailItemViewModel>().Select(a => a.MailCopy), toggleExecution: true);
+        if (ActionItem is MailItemViewModel mailItemViewModel)
+            package = new MailOperationPreperationRequest(operation, mailItemViewModel.MailCopy, toggleExecution: true);
+
+        else if (ActionItem is ThreadMailItemViewModel threadMailItemViewModel)
+            package = new MailOperationPreperationRequest(operation, threadMailItemViewModel.ThreadEmails.Select(a => a.MailCopy), toggleExecution: true);

        if (package == null) return;

@@ -54,18 +54,28 @@
        <DataTemplate x:Key="SingleMailItemTemplate" x:DataType="viewModelData:MailItemViewModel">
            <controls:MailItemDisplayInformationControl
                x:DefaultBindMode="OneWay"
+                ActionItem="{x:Bind}"
+                Base64ContactPicture="{x:Bind MailCopy.SenderContact.Base64ContactPicture, Mode=OneWay, TargetNullValue=''}"
                CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
                ContextRequested="MailItemContextRequested"
+                CreationDate="{x:Bind CreationDate}"
                DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
+                FromAddress="{x:Bind FromAddress}"
+                FromName="{x:Bind FromName}"
+                HasAttachments="{x:Bind HasAttachments, Mode=OneWay}"
                HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
+                IsDraft="{x:Bind IsDraft, Mode=OneWay}"
+                IsFlagged="{x:Bind IsFlagged, Mode=OneWay}"
                IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
+                IsRead="{x:Bind IsRead, Mode=OneWay}"
                IsThumbnailUpdated="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}"
                LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
-                MailItem="{x:Bind MailCopy, Mode=OneWay}"
                Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
+                PreviewText="{x:Bind PreviewText, Mode=OneWay}"
                RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
-                ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}" />
+                ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}"
+                Subject="{x:Bind Subject, Mode=OneWay}" />
        </DataTemplate>

        <DataTemplate x:Key="ThreadMailItemTemplate" x:DataType="viewModelData:ThreadMailItemViewModel">
@@ -76,20 +86,30 @@
                <controls:WinoExpander.Header>
                    <controls:MailItemDisplayInformationControl
                        x:DefaultBindMode="OneWay"
+                        ActionItem="{x:Bind}"
+                        Base64ContactPicture="{x:Bind Base64ContactPicture, Mode=OneWay, TargetNullValue=''}"
                        CenterHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.CenterHoverAction, Mode=OneWay}"
                        ContextRequested="MailItemContextRequested"
+                        CreationDate="{x:Bind CreationDate}"
                        DisplayMode="{Binding ElementName=root, Path=ViewModel.PreferencesService.MailItemDisplayMode, Mode=OneWay}"
+                        FromAddress="{x:Bind FromAddress}"
+                        FromName="{x:Bind FromName}"
+                        HasAttachments="{x:Bind HasAttachments, Mode=OneWay}"
                        HoverActionExecutedCommand="{Binding ElementName=root, Path=ViewModel.ExecuteHoverActionCommand}"
                        IsAvatarVisible="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowSenderPicturesEnabled, Mode=OneWay}"
+                        IsDraft="{x:Bind IsDraft, Mode=OneWay}"
+                        IsFlagged="{x:Bind IsFlagged, Mode=OneWay}"
                        IsHoverActionsEnabled="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsHoverActionsEnabled, Mode=OneWay}"
+                        IsRead="{x:Bind IsRead, Mode=OneWay}"
                        IsThreadExpanded="{x:Bind IsThreadExpanded, Mode=OneWay}"
                        IsThreadExpanderVisible="True"
-                        IsThumbnailUpdated="{x:Bind LatestMailViewModel.ThumbnailUpdatedEvent, Mode=OneWay}"
+                        IsThumbnailUpdated="{x:Bind ThumbnailUpdatedEvent, Mode=OneWay}"
                        LeftHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.LeftHoverAction, Mode=OneWay}"
-                        MailItem="{x:Bind LatestMailViewModel.MailCopy, Mode=OneWay}"
                        Prefer24HourTimeFormat="{Binding ElementName=root, Path=ViewModel.PreferencesService.Prefer24HourTimeFormat, Mode=OneWay}"
+                        PreviewText="{x:Bind PreviewText, Mode=OneWay}"
                        RightHoverAction="{Binding ElementName=root, Path=ViewModel.PreferencesService.RightHoverAction, Mode=OneWay}"
-                        ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}" />
+                        ShowPreviewText="{Binding ElementName=root, Path=ViewModel.PreferencesService.IsShowPreviewEnabled, Mode=OneWay}"
+                        Subject="{x:Bind Subject, Mode=OneWay}" />
                </controls:WinoExpander.Header>
                <controls:WinoExpander.Content>
                    <listview:WinoListView
@@ -26,22 +26,28 @@
        <DataTemplate x:Key="CompactDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
            <controls1:MailItemDisplayInformationControl
                DisplayMode="Compact"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="False" />
+                FromAddress="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromAddress}"
+                FromName="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromName}"
+                ShowPreviewText="False"
+                Subject="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.Subject}" />
        </DataTemplate>

        <DataTemplate x:Key="MediumDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
            <controls1:MailItemDisplayInformationControl
                DisplayMode="Medium"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="True" />
+                FromAddress="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromAddress}"
+                FromName="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromName}"
+                ShowPreviewText="True"
+                Subject="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.Subject}" />
        </DataTemplate>

        <DataTemplate x:Key="SpaciousDisplayModePreviewTemplate" x:DataType="enums:MailListDisplayMode">
            <controls1:MailItemDisplayInformationControl
                DisplayMode="Spacious"
-                MailItem="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy}"
-                ShowPreviewText="True" />
+                FromAddress="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromAddress}"
+                FromName="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.FromName}"
+                ShowPreviewText="True"
+                Subject="{Binding ElementName=root, Path=ViewModel.DemoPreviewMailCopy.Subject}" />
        </DataTemplate>

        <mailSelectors:MailItemDisplayModePreviewTemplateSelector