diff --git a/Yesod/Form/Fields.hs b/Yesod/Form/Fields.hs
index 91df3893..d4fbfd6d 100644
--- a/Yesod/Form/Fields.hs
+++ b/Yesod/Form/Fields.hs
@@ -69,6 +69,7 @@ data FormMessage = MsgInvalidInteger Text
                  | MsgInvalidMinute Text
                  | MsgInvalidSecond Text
                  | MsgInvalidDay
+                 | MsgCsrfWarning
 
 defaultFormMessage :: FormMessage -> Text
 defaultFormMessage (MsgInvalidInteger t) = "Invalid integer: " `mappend` t
@@ -81,6 +82,7 @@ defaultFormMessage (MsgInvalidEmail t) = "Invalid e-mail address: " `mappend` t
 defaultFormMessage (MsgInvalidHour t) = "Invalid hour: " `mappend` t
 defaultFormMessage (MsgInvalidMinute t) = "Invalid minute: " `mappend` t
 defaultFormMessage (MsgInvalidSecond t) = "Invalid second: " `mappend` t
+defaultFormMessage MsgCsrfWarning = "As a protection against cross-site request forgery attacks, please confirm your form submission."
 
 intField :: (Monad monad, Integral i) => Field (GGWidget master monad ()) FormMessage i
 intField = Field
diff --git a/Yesod/Form/Functions.hs b/Yesod/Form/Functions.hs
index 28e30ac7..767e9c47 100644
--- a/Yesod/Form/Functions.hs
+++ b/Yesod/Form/Functions.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Yesod.Form.Functions
     ( -- * Running in Form monad
       newFormIdent
@@ -26,6 +27,7 @@ module Yesod.Form.Functions
     ) where
 
 import Yesod.Form.Types
+import Yesod.Form.Fields (FormMessage (MsgCsrfWarning))
 import Data.Text (Text, pack)
 import Control.Monad.Trans.RWS (ask, get, put, runRWST, tell, evalRWST)
 import Control.Monad.Trans.Class (lift)
@@ -141,7 +143,8 @@ aopt a b = formToAForm . mopt a b
 runFormGeneric :: Monad m => Form master m a -> master -> [Text] -> Maybe (Env, FileEnv) -> m (a, Enctype)
 runFormGeneric form master langs env = evalRWST form (env, master, langs) (IntSingle 1)
 
-runFormPost :: (Html -> Form master (GHandler sub master) (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
+runFormPost :: RenderMessage master FormMessage
+            => (Html -> Form master (GHandler sub master) (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPost form = do
     req <- getRequest
     let nonceKey = "_nonce"
@@ -159,13 +162,10 @@ runFormPost form = do
             case (res, env) of
                 (FormSuccess{}, Just (params, _))
                     | lookup nonceKey params /= reqNonce req ->
-                        FormFailure [csrfWarning]
+                        FormFailure [renderMessage m langs MsgCsrfWarning]
                 _ -> res
     return ((res', xml), enctype)
 
-csrfWarning :: Text
-csrfWarning = "As a protection against cross-site request forgery attacks, please confirm your form submission." -- TRANS
-
 runFormPostNoNonce :: (Html -> Form master (GHandler sub master) (FormResult a, xml)) -> GHandler sub master ((FormResult a, xml), Enctype)
 runFormPostNoNonce form = do
     req <- getRequest