diff --git a/src/GF/Text/Text.hs b/src/GF/Text/Text.hs
index 7b7f18469..3e1b9c46d 100644
--- a/src/GF/Text/Text.hs
+++ b/src/GF/Text/Text.hs
@@ -71,6 +71,7 @@ formatAsTextGen tag para = unwords . format . cap . words where
     w : c : ww | major c -> format $ (w ++ c) :(cap ww)
     w : c : ww | minor c -> format $ (w ++ c) :    ww
     p : c : ww | openp p -> format $ (p ++ c) :ww
+    p : c : ww | spanish p -> format $ (p ++ concat (cap [c])) :ww
     c     : ww | para  c -> "\n\n"        : format ww
     w     : ww           -> w             : format ww
     [] -> []
@@ -81,6 +82,7 @@ formatAsTextGen tag para = unwords . format . cap . words where
   major = flip elem (map singleton ".!?") 
   minor = flip elem (map singleton ",:;)")
   openp = all (flip elem "(")
+  spanish = all (flip elem "Ąż")
 
 formatAsCode :: String -> String
 formatAsCode = rend 0 . words where
diff --git a/src/GF/UseGrammar/Treebank.hs b/src/GF/UseGrammar/Treebank.hs
index cf1652ae9..12dc598f2 100644
--- a/src/GF/UseGrammar/Treebank.hs
+++ b/src/GF/UseGrammar/Treebank.hs
@@ -110,6 +110,6 @@ linearize mgr lang =
   linTree2string noMark (canModules mgr) (zIdent lang) 
  where
    sgr   = stateGrammarOfLangOpt False mgr (zIdent lang)
-   untok = customOrDefault noOptions useUntokenizer customUntokenizer sgr
+   untok = customOrDefault (stateOptions sgr) useUntokenizer customUntokenizer sgr
 
 showTree t = prt_ $ tree2exp t