diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index cdfa823dec..ec3eb426c2 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -112,7 +112,7 @@ private function _create_album($album) {
       log::success("content", "Created an album",
                html::anchor("albums/$new_album->id", "view album"));
       message::success(
-        t("Created album %album_title", array("album_title" => p::clean($new_album->title))));
+        t("Created album %album_title", array("album_title" => $new_album->title)));
 
       print json_encode(
         array("result" => "success",
@@ -145,7 +145,7 @@ private function _create_photo($album) {
 
       log::success("content", "Added a photo", html::anchor("photos/$photo->id", "view photo"));
       message::success(
-        t("Added photo %photo_title", array("photo_title" => p::clean($photo->title))));
+        t("Added photo %photo_title", array("photo_title" => $photo->title)));
 
       print json_encode(
         array("result" => "success",
@@ -194,7 +194,7 @@ public function _update($album) {
 
       log::success("content", "Updated album", "<a href=\"albums/$album->id\">view</a>");
       message::success(
-        t("Saved album %album_title", array("album_title" => p::clean($album->title))));
+        t("Saved album %album_title", array("album_title" => $album->title)));
 
       print json_encode(
         array("result" => "success",
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 65ea3381b0..c2f957318b 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -2,8 +2,8 @@
 <? // @todo Set hover on AlbumGrid list items for guest users ?>
 <div id="gInfo">
   <?= $theme->album_top() ?>
-  <h1><?= p::purify($item->title) ?></h1>
-  <div class="gDescription"><?= nl2br(p::purify($item->description)) ?></div>
+  <h1><?= SafeString::of($item->title)->purified_html() ?></h1>
+  <div class="gDescription"><?= nl2br(SafeString::of($item->description)->purified_html()) ?></div>
 </div>
 
 <ul id="gAlbumGrid">
@@ -20,7 +20,7 @@
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <?= $theme->thumb_menu($child) ?>
-    <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
+    <h2><span></span><a href="<?= $child->url() ?>"><?= SafeString::of($child->title) ?></a></h2>
     <ul class="gMetadata">
       <?= $theme->thumb_info($child) ?>
     </ul>