diff --git a/src/ChangeLog b/src/ChangeLog
index 1153fc76a33d375b7edc3d23cb2726846132a093..f8a296a4a074247c0c77ca81698004f0197a76a5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,12 @@
+2005-01-18  Pontus Freyhult  <pont@soua.net>
+
+	* swedish-strings.el: Added compatibility key bindings for XEmacs
+	21.4 in UTF-8 mode (on tty).
+
 2005-01-16  Pontus Freyhult  <pont@soua.net>
 
 	* swedish-strings.el: Added compatibility key bindings to make GNU
-	Emacs 21 in UTF-8 mode work correctly.
+	Emacs 21 in UTF-8 mode (on tty) work correctly.
 
 2005-01-12  Ulrik Haugen  <qha@lysator.liu.se>
 
diff --git a/src/swedish-strings.el b/src/swedish-strings.el
index 8321f1b644e96c7dffc92066c7f45cacdd2d574e..5025aaeed23176d11009faf1342d261203afa066 100644
--- a/src/swedish-strings.el
+++ b/src/swedish-strings.el
@@ -111,7 +111,11 @@
   (lyskom-try-define-key lyskom-sv-edit-prefix [3909]    'lyskom-sv-edit-review-prefix)
   (lyskom-try-define-key lyskom-sv-edit-prefix [3941]    'lyskom-sv-edit-review-prefix)
   (lyskom-try-define-key lyskom-sv-edit-prefix [195 165] 'lyskom-sv-edit-review-prefix)
-  (lyskom-try-define-key lyskom-sv-edit-prefix [195 133] 'lyskom-sv-edit-review-prefix)
+  (lyskom-try-define-key lyskom-sv-edit-prefix [195 165] 'lyskom-sv-edit-review-prefix)
+  (lyskom-try-define-key lyskom-sv-edit-prefix [(�)]     (let ((k (make-sparse-keymap)))
+							   (define-key k (vector (intern "\205")) 'lyskom-sv-edit-review-prefix)
+							   (define-key k [�] 'lyskom-sv-edit-review-prefix)
+							   k))
 
   (define-key lyskom-sv-edit-prefix (kbd "?")       'lyskom-help)
   (define-key lyskom-sv-edit-prefix (kbd "*")       'kom-button-press)
@@ -2732,6 +2736,14 @@ Nuvarande r
   (lyskom-try-define-key lyskom-sv-mode-map [195 165] 'lyskom-sv-review-prefix)
   (lyskom-try-define-key lyskom-sv-mode-map [195 133] 'lyskom-sv-review-prefix)
 
+  ; XEmacs 21.4 UTF-8 on terminal compatibility
+  (lyskom-try-define-key lyskom-sv-mode-map [(�)]      (let ((k (make-sparse-keymap)))
+                                                           (define-key k (vector (intern "\205")) 'lyskom-sv-review-prefix)
+                                                           (define-key k [�] 'lyskom-sv-review-prefix)
+                                                           (define-key k (vector (intern "\204")) 'lyskom-sv-change-prefix)
+                                                           (define-key k [(�)] 'lyskom-sv-change-prefix)
+							   k))
+
   (define-key lyskom-sv-mode-map (kbd "M-m") 'kom-toggle-mark-as-read-prefix)
   (define-key lyskom-sv-mode-map (kbd "M-c") 'kom-toggle-cache-prefix)
 
@@ -2824,6 +2836,10 @@ Nuvarande r
   (lyskom-try-define-key lyskom-sv-list-prefix [3940]    'kom-list-summary)
   (lyskom-try-define-key lyskom-sv-list-prefix [195 164] 'kom-list-summary)
   (lyskom-try-define-key lyskom-sv-list-prefix [195 132] 'kom-list-summary)
+  (lyskom-try-define-key lyskom-sv-list-prefix [(�)]        (let ((k (make-sparse-keymap)))
+                                                           (define-key k (vector (intern "\204")) 'kom-list-summary)
+                                                           (define-key k [�] 'kom-list-summary)
+							   k))
 
   (define-key lyskom-sv-filter-get-prefix (kbd "u") 'kom-get-appreciation)
   (define-key lyskom-sv-filter-get-prefix (kbd "s") 'kom-get-abuse)
@@ -2849,7 +2865,10 @@ Nuvarande r
   (lyskom-try-define-key lyskom-sv-filter-get-prefix [3940]       'kom-filter-subject)
   (lyskom-try-define-key lyskom-sv-filter-get-prefix [195 164]    'kom-filter-subject)
   (lyskom-try-define-key lyskom-sv-filter-get-prefix [195 132]    'kom-filter-subject)
-
+  (lyskom-try-define-key lyskom-sv-filter-get-prefix [(�)]        (let ((k (make-sparse-keymap)))
+                                                           (define-key k (vector (intern "\204")) 'kom-filter-subject)
+                                                           (define-key k [�] 'kom-filter-subject)
+							   k))
 
   (define-key lyskom-sv-who-prefix (kbd "i") 'kom-who-is-on)
   (define-key lyskom-sv-who-prefix (kbd "m") 'kom-who-is-on-in-conference)
@@ -2958,6 +2977,10 @@ Nuvarande r
   (lyskom-try-define-key lyskom-sv-S-prefix [3940]       'kom-send-message)
   (lyskom-try-define-key lyskom-sv-S-prefix [195 164]    'kom-send-message)
   (lyskom-try-define-key lyskom-sv-S-prefix [195 132]    'kom-send-message)
+  (lyskom-try-define-key lyskom-sv-S-prefix [(�)]        (let ((k (make-sparse-keymap)))
+                                                           (define-key k (vector (intern "\204")) 'kom-send-message)
+                                                           (define-key k [�] 'kom-send-message)
+							   k))
 
   (define-key lyskom-sv-A-prefix (kbd "m") 'kom-add-recipient)
   (define-key lyskom-sv-A-prefix (kbd "e") 'kom-add-copy)