diff --git a/library/Class/ScriptLoader.php b/library/Class/ScriptLoader.php
index ed5b14019675a1a809e6bd64da3adf86edb35a6a..1f4be04427c15517d905851b7fc31bf74f2ce3c0 100644
--- a/library/Class/ScriptLoader.php
+++ b/library/Class/ScriptLoader.php
@@ -326,7 +326,7 @@ class Class_ScriptLoader {
 		$notifications->eachDo(
 													 function($n) use (&$popup_messages, &$bar_messages) {
 														 $n->isPopup()
-															 ? $popup_messages []= $n->getMessage()
+															 ? $popup_messages []= htmlspecialchars($n->getMessage(), ENT_QUOTES)
 															 : $bar_messages []= $n->getMessage();
 													 });
 
diff --git a/library/Class/TextReplacements.php b/library/Class/TextReplacements.php
index 05c6f96c063568c8a2f7d31695546cb3c981db61..c9c79cde2bcbc0e7e971668d02a183fd910120be 100644
--- a/library/Class/TextReplacements.php
+++ b/library/Class/TextReplacements.php
@@ -50,6 +50,8 @@ class Class_TextReplacements  {
 
 
 	public function getReplacement($text) {
+		if (false !== strpos($text, 'Vous avez '))
+			xdebug_break();
 		foreach($this->_replacements as $search => $replace) {
 			if (false !== strpos($text, $search))
 				return str_replace($search, $replace, $text);
diff --git a/tests/application/modules/opac/controllers/PanierControllerTest.php b/tests/application/modules/opac/controllers/PanierControllerTest.php
index c428b46fc986473053afdd5ef716bfe7a747b3b2..30114c3a8421c3c1642e63bf77a6d14e56102363 100644
--- a/tests/application/modules/opac/controllers/PanierControllerTest.php
+++ b/tests/application/modules/opac/controllers/PanierControllerTest.php
@@ -168,7 +168,8 @@ class PanierControllerIndexActionWithTextReplacmentsTest extends PanierControlle
 																													['Vos paniers de documents;Votre sélection de documents',
 																													 ' ',
 																													 ' panier ;  sélection;',
-																													 'erreur']
+																													 'erreur',
+																													 'Afficher en résultat de recherche;L\'afficher en recherche']
 																				)]);
 		Class_TextReplacements::reset();
 		$this->dispatch('/opac/panier', true);
@@ -177,14 +178,22 @@ class PanierControllerIndexActionWithTextReplacmentsTest extends PanierControlle
 
 	/** @test */
 	public function h1ShouldContainsVotreSelectionDeDocuments() {
-		$this->assertXPathContentContains('//h1', 'Votre sélection de documents',
-																			$this->_response->getBody());
+		$this->assertXPathContentContains('//h1', 'Votre sélection de documents');
 	}
 
+
 	/** @test */
 	public function spanShouldContainsVousAvezDeuxSelections() {
 		$this->assertXPathContentContains('//span[@class="abonne"]', 'Vous avez 2 sélections');
 	}
+
+
+	/** @test */
+	public function thShouldContainsLAfficherEnRecherche() {
+		$this->assertXPathContentContains('//table[@class="soustitre"]//th',
+																			'L\'afficher en recherche');
+
+	}
 }
 
 
diff --git a/tests/library/Class/ScriptLoaderTest.php b/tests/library/Class/ScriptLoaderTest.php
index e47360c48f9b2c7164f629ebfce5d8c4153e31b1..1a1975046441cfdb7619a938d605461970942b69 100644
--- a/tests/library/Class/ScriptLoaderTest.php
+++ b/tests/library/Class/ScriptLoaderTest.php
@@ -244,7 +244,7 @@ class ScriptLoaderNotificationsBarTest extends Storm_Test_ModelTestCase {
 		$messenger->addNotification('First message');
 		$messenger->addNotification('Second message');
 		$messenger->addNotification('Third message', ['display' => 'popup']);
-		$messenger->addNotification('Fourth message', ['display' => 'popup']);
+		$messenger->addNotification('Fourth\'message', ['display' => 'popup']);
 
 		ZendAfi_Controller_Action_Helper_FlashMessenger::reset();
 		$this->_html = Class_ScriptLoader::getInstance()->showNotifications()->html();
@@ -267,7 +267,7 @@ class ScriptLoaderNotificationsBarTest extends Storm_Test_ModelTestCase {
 
 	/** @test */
 	public function messageThreeAndFourShouldBePopupedUpInJQueryDialog() {
-		$this->assertContains("$('<p title=\"Information\">Third message<br> Fourth message</p>').dialog()",
+		$this->assertContains("$('<p title=\"Information\">Third message<br> Fourth&#039;message</p>').dialog()",
 													$this->_html);
 	}
 }