diff --git a/src/Vervis/Foundation.hs b/src/Vervis/Foundation.hs
index da7f95e..3eb80d3 100644
--- a/src/Vervis/Foundation.hs
+++ b/src/Vervis/Foundation.hs
@@ -240,7 +240,7 @@ instance Yesod App where
 
     defaultLayout widget = do
         master <- getYesod
-        mmsg <- getMessage
+        msgs <- getMessages
         mperson <- do
             mperson' <- maybeAuthAllowUnverified
             for mperson' $ \ (p@(Entity pid person), verified) -> runDB $ do
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index e544d89..2068ff4 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -81,8 +81,9 @@ $if federationDisabled
 
 ^{breadcrumbsW}
 
-$maybe msg <- mmsg
-  <div #message>#{msg}
+<div #messages>
+  $forall (_status, msg) <- msgs
+    <div .message>#{msg}
 
 ^{widget}