diff --git a/src/Decho/Decho.csproj b/src/Decho/Decho.csproj
index a872461..ff66962 100644
--- a/src/Decho/Decho.csproj
+++ b/src/Decho/Decho.csproj
@@ -23,6 +23,7 @@
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="GHSoftware.Avalonia.SpellChecker.Avalonia11" Version="0.3.3" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
     <PackageReference Include="NetCoreAudio" Version="2.0.1" />
     <PackageReference Include="OsNotifications" Version="1.1.5" />
diff --git a/src/Decho/Views/MessageComposerView.axaml.cs b/src/Decho/Views/MessageComposerView.axaml.cs
index 50e269b..08e5f56 100644
--- a/src/Decho/Views/MessageComposerView.axaml.cs
+++ b/src/Decho/Views/MessageComposerView.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.Platform.Storage;
+using Avalonia.SpellChecker;
 
 using Decho.Models;
 using Decho.ViewModels;
@@ -15,6 +16,8 @@ namespace Decho.Views;
 
 public partial class MessageComposerView : UserControl
 {
+    private readonly TextBoxSpellChecker _spellChecker;
+
     public MessageComposerView()
     {
         InitializeComponent();
@@ -25,6 +28,9 @@ public partial class MessageComposerView : UserControl
 
         // Intercept Enter before the TextBox processes it (AcceptsReturn=True would insert a newline)
         MessageTextBox.AddHandler(InputElement.KeyDownEvent, OnTextBoxTunnelingKeyDown, RoutingStrategies.Tunnel);
+
+        _spellChecker = new TextBoxSpellChecker(SpellCheckerConfig.Create("en_GB"));
+        _spellChecker.Initialize(MessageTextBox);
     }
 
     private void OnDataContextChanged(object? sender, EventArgs e)