diff --git a/src/OutlookAddin.UI/Converters/EntityTypeToHebrewConverter.cs b/src/OutlookAddin.UI/Converters/EntityTypeToHebrewConverter.cs
index dafff31..78a17d9 100644
--- a/src/OutlookAddin.UI/Converters/EntityTypeToHebrewConverter.cs
+++ b/src/OutlookAddin.UI/Converters/EntityTypeToHebrewConverter.cs
@@ -84,6 +84,10 @@ namespace MarcusLaw.OutlookAddin.UI.Converters
                 ["New"] = "חדש",
                 ["Assigned"] = "הוקצה",
                 ["Pending"] = "ממתין",
+                ["PendingHearing"] = "ממתין לדיון",
+                ["Pending Hearing"] = "ממתין לדיון",
+                ["PendingDecision"] = "ממתין להחלטה",
+                ["Pending Decision"] = "ממתין להחלטה",
                 ["In Progress"] = "בטיפול",
                 ["InProgress"] = "בטיפול",
                 ["Open"] = "פתוח",
diff --git a/src/OutlookAddin.UI/Dialogs/SaveAttachmentsDialog.xaml b/src/OutlookAddin.UI/Dialogs/SaveAttachmentsDialog.xaml
index 7daf05c..acdfb83 100644
--- a/src/OutlookAddin.UI/Dialogs/SaveAttachmentsDialog.xaml
+++ b/src/OutlookAddin.UI/Dialogs/SaveAttachmentsDialog.xaml
@@ -1,6 +1,7 @@
 <Window x:Class="MarcusLaw.OutlookAddin.UI.Dialogs.SaveAttachmentsDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:conv="clr-namespace:MarcusLaw.OutlookAddin.UI.Converters"
         Title="שמור קבצים מצורפים ל-Klear"
         Height="560" Width="620"
         MinHeight="420" MinWidth="500"
@@ -11,6 +12,9 @@
         Background="#F8FAFC"
         FontFamily="Segoe UI, David, Frank Ruehl, Arial">
     <Window.Resources>
+        <conv:CaseStatusToHebrewConverter x:Key="CaseStatusHe" />
+        <BooleanToVisibilityConverter x:Key="BoolToVis" />
+
         <SolidColorBrush x:Key="Primary"      Color="#2563EB" />
         <SolidColorBrush x:Key="PrimaryHover" Color="#1D4ED8" />
         <SolidColorBrush x:Key="Border"       Color="#E2E8F0" />
@@ -133,7 +137,7 @@
                     <DataGridTextColumn Header="מס׳ תיק" Binding="{Binding Number}" Width="80" />
                     <DataGridTextColumn Header="שם" Binding="{Binding Name}" Width="*" />
                     <DataGridTextColumn Header="מס׳ בבית משפט" Binding="{Binding CourtCaseNumber}" Width="140" />
-                    <DataGridTextColumn Header="סטטוס" Binding="{Binding Status}" Width="100" />
+                    <DataGridTextColumn Header="סטטוס" Binding="{Binding Status, Converter={StaticResource CaseStatusHe}}" Width="110" />
                 </DataGrid.Columns>
             </DataGrid>
         </Border>
@@ -142,9 +146,22 @@
         <DockPanel Grid.Row="2" Margin="0,10,0,0" LastChildFill="True">
             <TextBlock DockPanel.Dock="Left" Text="תיקייה:" VerticalAlignment="Center"
                        Margin="0,0,8,0" Foreground="{StaticResource Muted}" FontSize="12" />
+            <TextBlock DockPanel.Dock="Right" Text="טוען…" VerticalAlignment="Center"
+                       Margin="8,0,0,0" Foreground="{StaticResource Muted}" FontSize="12"
+                       Visibility="{Binding IsLoadingSubfolders, Converter={StaticResource BoolToVis}}" />
             <ComboBox ItemsSource="{Binding Subfolders}"
                       SelectedItem="{Binding SelectedSubfolder}"
-                      Padding="6,4" />
+                      Padding="6,4">
+                <ComboBox.Style>
+                    <Style TargetType="ComboBox">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsLoadingSubfolders}" Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </ComboBox.Style>
+            </ComboBox>
         </DockPanel>
 
         <!-- Attachments header -->
@@ -167,10 +184,14 @@
                                            FontSize="11"
                                            VerticalAlignment="Center"
                                            Margin="8,0,0,0" />
-                                <TextBlock Text="{Binding FileName}"
-                                           VerticalAlignment="Center"
-                                           TextTrimming="CharacterEllipsis"
-                                           Margin="8,0,0,0" />
+                                <TextBox Text="{Binding FileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         IsEnabled="{Binding IsSelected}"
+                                         VerticalAlignment="Center"
+                                         BorderThickness="1"
+                                         BorderBrush="{StaticResource Border}"
+                                         Padding="6,3"
+                                         Margin="8,0,0,0"
+                                         ToolTip="לחץ כדי לערוך את שם הקובץ לפני השמירה" />
                             </DockPanel>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
diff --git a/src/OutlookAddin.UI/ViewModels/AttachmentRowViewModel.cs b/src/OutlookAddin.UI/ViewModels/AttachmentRowViewModel.cs
index f510a0a..1123a45 100644
--- a/src/OutlookAddin.UI/ViewModels/AttachmentRowViewModel.cs
+++ b/src/OutlookAddin.UI/ViewModels/AttachmentRowViewModel.cs
@@ -10,7 +10,17 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         [ObservableProperty]
         private bool isSelected = true;
 
-        public string FileName => Data.Name;
+        public string FileName
+        {
+            get => Data.Name;
+            set
+            {
+                var newName = value ?? string.Empty;
+                if (Data.Name == newName) return;
+                Data.Name = newName;
+                OnPropertyChanged();
+            }
+        }
 
         public string SizeDisplay { get; }
 
diff --git a/src/OutlookAddin.UI/ViewModels/SaveAttachmentsViewModel.cs b/src/OutlookAddin.UI/ViewModels/SaveAttachmentsViewModel.cs
index 61621de..c114e7b 100644
--- a/src/OutlookAddin.UI/ViewModels/SaveAttachmentsViewModel.cs
+++ b/src/OutlookAddin.UI/ViewModels/SaveAttachmentsViewModel.cs
@@ -45,6 +45,9 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         [ObservableProperty]
         private string? statusMessage;
 
+        [ObservableProperty]
+        private bool isLoadingSubfolders;
+
         /// <summary>
         /// Resolved server-side case folder path for the currently
         /// selected case (e.g. "47-אריאל מונאס"). Populated by
@@ -140,6 +143,19 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             var c = SelectedCase;
             if (c == null || string.IsNullOrEmpty(c.Id)) return;
 
+            IsLoadingSubfolders = true;
+            try
+            {
+                await RefreshSubfoldersCoreAsync(c).ConfigureAwait(true);
+            }
+            finally
+            {
+                IsLoadingSubfolders = false;
+            }
+        }
+
+        private async Task RefreshSubfoldersCoreAsync(CaseEntity c)
+        {
             try { await _client.EnsureCaseSubfoldersAsync(c.Id).ConfigureAwait(true); }
             catch (Exception ex) { _logger.Warning(ex, "EnsureCaseSubfolders failed; subfolders may be missing on disk"); }
 
diff --git a/src/OutlookAddin.UI/ViewModels/SettingsViewModel.cs b/src/OutlookAddin.UI/ViewModels/SettingsViewModel.cs
index ace73a8..031edd4 100644
--- a/src/OutlookAddin.UI/ViewModels/SettingsViewModel.cs
+++ b/src/OutlookAddin.UI/ViewModels/SettingsViewModel.cs
@@ -105,6 +105,22 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
                 // Not running under ClickOnce (dev / F5), or System.Deployment
                 // is not available — fall through to the AssemblyVersion.
             }
+            // The host VSTO assembly is where versioning policy lives
+            // (csproj + AssemblyInfo). The UI assembly is SDK-style with
+            // no <Version>, so it always reports 1.0.0.0 — don't fall back
+            // to it. Walk loaded assemblies for the host by name suffix.
+            if (v == null)
+            {
+                foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    var name = asm.GetName().Name;
+                    if (name != null && name.EndsWith(".OutlookAddin", StringComparison.Ordinal))
+                    {
+                        v = asm.GetName().Version;
+                        break;
+                    }
+                }
+            }
             v ??= typeof(SettingsViewModel).Assembly.GetName().Version;
             if (v == null) return "1.0.0";
 
diff --git a/src/OutlookAddin/OutlookAddin.csproj b/src/OutlookAddin/OutlookAddin.csproj
index 2a64b20..d571eec 100644
--- a/src/OutlookAddin/OutlookAddin.csproj
+++ b/src/OutlookAddin/OutlookAddin.csproj
@@ -36,7 +36,7 @@
     <PublishUrl>C:\Users\Chaim\source\repos\OutlookAddin\Publish\</PublishUrl>
     <InstallUrl>https://gitea.dev.marcus-law.co.il/espocrm-extensions/OutlookAddin/raw/branch/main/Publish/</InstallUrl>
     <TargetCulture>en</TargetCulture>
-    <ApplicationVersion>1.0.7.0</ApplicationVersion>
+    <ApplicationVersion>1.1.2.0</ApplicationVersion>
     <AutoIncrementApplicationRevision>false</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>7</UpdateInterval>
diff --git a/src/OutlookAddin/Properties/AssemblyInfo.cs b/src/OutlookAddin/Properties/AssemblyInfo.cs
index c7e239d..c848049 100644
--- a/src/OutlookAddin/Properties/AssemblyInfo.cs
+++ b/src/OutlookAddin/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@ using System.Security;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7.0")]
-[assembly: AssemblyFileVersion("1.0.7.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
+[assembly: AssemblyFileVersion("1.1.2.0")]