diff --git a/feeds_ui/feeds_ui.admin.inc b/feeds_ui/feeds_ui.admin.inc
index 1799fe5f1f2e8eb05bc362512bae105e9784aa3e..bfea283b96b3df7f155ca62e25ebf7acd83cd0ec 100644
--- a/feeds_ui/feeds_ui.admin.inc
+++ b/feeds_ui/feeds_ui.admin.inc
@@ -781,7 +781,7 @@ function feeds_ui_mapping_form_submit($form, &$form_state) {
 
   if (!empty($form_state['values']['remove_flags'])) {
     $remove_flags = array_keys(array_filter($form_state['values']['remove_flags']));
-    
+
     foreach ($remove_flags as $k) {
       unset($mappings[$k]);
       unset($form_state['values']['mapping_weight'][$k]);
@@ -830,7 +830,8 @@ function feeds_ui_mapping_settings_optional_unique_summary($mapping, $target, $f
   if (!empty($target['optional_unique'])) {
     if ($mapping['unique']) {
       return t('Used as <strong>unique</strong>.');
-    } else {
+    }
+    else {
       return t('Not used as unique.');
     }
   }
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index 41cdcc00de8b85b4032546cc33a6d67530374c64..119c0bf25101567e15e3acb2a88e59b6e3d39f37 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -308,7 +308,7 @@ class PuSHEnvironment implements PuSHSubscriberEnvironmentInterface {
    * Implements PuSHSubscriberEnvironmentInterface::msg().
    */
   public function msg($msg, $level = 'status') {
-    drupal_set_message($msg, $level);
+    drupal_set_message(check_plain($msg), $level);
   }
 
   /**