diff --git a/History b/History
index c8902b9906b3192ffda7536038bcc826d2e4dfa4..7eac3bd4f8014da0132e0af3c2197e536395641a 100644
--- a/History
+++ b/History
@@ -12,3 +12,7 @@ Version	   Date		Who	Change
 				first Message_PlugInQuit
 0.04	22/07/1998	BJGA	"Desktop font" label was getting truncated when
 				NewHall.Bold was selected as the desktop font
+0.05	28/08/1998	BJGA	Window object now sorted in component order.
+				Bugfix: encoding information is no longer
+				stored in Wimp$Font, so the alphabet can now be
+				set independently
diff --git a/Resources/UK/Messages b/Resources/UK/Messages
index e21c0d5465f6feaeb00aae964f44d4f18864a36a..a028692c2e6afa1fa80ae65be686496799d528a5 100644
--- a/Resources/UK/Messages
+++ b/Resources/UK/Messages
@@ -1,7 +1,7 @@
 _TaskName:Fonts Setup
 _Purpose:Configuring fonts
 _Author:© Acorn Computers Ltd, 1998
-_Version:0.04 (22-Jul-98)
+_Version:0.05 (28-Aug-98)
 _ConfigText:Fonts
 _ConfigHelp:Click SELECT to open the font configuration window.
 _ConfigSprite:co_fonts
diff --git a/Resources/UK/Res,fae b/Resources/UK/Res,fae
index 4236c3444e6003a84ec5ff4491cbe1bc37575108..144661216471983a82de2bc8f01a19c9ec34c1bb 100644
Binary files a/Resources/UK/Res,fae and b/Resources/UK/Res,fae differ
diff --git a/c/Settings b/c/Settings
index a70a7fb0af052588e8de25dd07741ad08958357f..bd348c94c0ec4f578df8db73b5e8187ef652b9d0 100644
--- a/c/Settings
+++ b/c/Settings
@@ -25,6 +25,8 @@ Date		Who	Change
 27/05/1998	BJGA	Initial faded-out values are now forcibly constrained
 			by "parent" fontmax setting
 28/05/1998	BJGA	Implemented settings_write
+28/08/1998	BJGA	Strips encoding information from font identifier
+			returned by fontmenu_get_font()
 
 \**************************************************************************/
 
@@ -142,6 +144,32 @@ BOOL settings_write (void)
   char string [256];
 
   throw (fontmenu_get_font (0, fontmenu_id, string, sizeof(string), NULL));
+  {
+    /* Strip out the encoding information ("\E" and/or "\e") */
+    const char *rd = string;
+    char *wr = string;
+    do
+    {
+      if (*rd == '\\' && (*(rd+1) == 'E' || *(rd+1) == 'e'))
+      {
+        /* Skip qualifier */
+        do
+        {
+          rd++;
+        }
+        while (*rd != '\\' && *rd >= ' ');
+      }
+      else
+      {
+        /* Copy byte down */
+        *wr = *rd;
+        rd++;
+        wr++;
+      }
+    }
+    while (*rd >= ' ');
+    *wr = '\0';
+  }
   DeskFont_Set (status_file, string);
 
   throw (numberrange_get_value (0, mainwindow_id, mainwindow_cachelimit, &fontmax));