diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
index 93edf839..81c8eea7 100644
--- a/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoMailItemViewModelListViewItem.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -25,10 +24,13 @@ public partial class WinoMailItemViewModelListViewItem : ListViewItem
     partial void OnItemPropertyChanged(DependencyPropertyChangedEventArgs e)
     {
         // TODO: This slows down. Optimize later.
-        Debug.WriteLine("WinoMailItemViewModelListViewItem item changed");
-
         if (e.OldValue is MailItemViewModel oldMailItemViewModel) UnregisterPropertyChanged(oldMailItemViewModel);
         if (e.NewValue is MailItemViewModel newMailItemViewModel) RegisterPropertyChanged(newMailItemViewModel);
+
+        if (e.NewValue is MailItemViewModel mailItemViewModel)
+            IsCustomSelected = mailItemViewModel.IsSelected;
+        else
+            IsCustomSelected = false;
     }
 
     private void RegisterPropertyChanged(MailItemViewModel model) => model.PropertyChanged += ModelPropertyChanged;
diff --git a/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs b/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
index 518b067b..df9a719c 100644
--- a/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
+++ b/Wino.Mail.WinUI/Controls/ListView/WinoThreadMailItemViewModelListViewItem.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using CommunityToolkit.WinUI;
 using Microsoft.UI.Xaml;
@@ -41,8 +40,6 @@ public partial class WinoThreadMailItemViewModelListViewItem : ListViewItem
 
     partial void OnItemPropertyChanged(DependencyPropertyChangedEventArgs e)
     {
-        Debug.WriteLine("WinoMailItemViewModelListViewItem item changed");
-
         if (e.OldValue is ThreadMailItemViewModel oldMailItemViewModel) UnregisterPropertyChanged(oldMailItemViewModel);
         if (e.NewValue is ThreadMailItemViewModel newMailItemViewModel) RegisterPropertyChanged(newMailItemViewModel);
     }