diff --git a/src/ChangeLog b/src/ChangeLog
index 1eef186377476bfcf99dc019dfeee608380efad6..771e9606cc421b7f5d1e5db45ee551144ff1d95e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-09  Ulrik Haugen  <ulrik@haugen.se>
+
+	Tuned patch from Marcus Comstedt.
+
+	* edit-text.el (lyskom-edit-send): Only bother with
+	lyskom-unity-text if latin-unity-remap-region is defined as a
+	function.
+
 2011-06-06  Ulrik Haugen  <ulrik@haugen.se>
 
 	Patch from Marcus Comstedt to select charsets latin-x more often.
diff --git a/src/edit-text.el b/src/edit-text.el
index bd7bd80ff36dd0cb3d33713dd844da4fb8a4be64..03bb50d11362cfd05352d7505022ffc7956b3f61 100644
--- a/src/edit-text.el
+++ b/src/edit-text.el
@@ -574,7 +574,8 @@ This runs `kom-send-text-hook' and (for backwards compatibility)
                                       'charset)))
 		       (mime-charset (with-temp-buffer
 				       (insert full-message)
-                                       (lyskom-unity-text (point-min) (point-max))
+                                       (when (fboundp 'latin-unity-remap-region)
+                                         (lyskom-unity-text (point-min) (point-max)))
 				       (lyskom-mime-charset-for-text (point-min) (point-max)))))
 
                   ;; If the charset isn't already set, encode the string