diff --git a/tmgmt.module b/tmgmt.module
index 70af0f2..67300e0 100644
--- a/tmgmt.module
+++ b/tmgmt.module
@@ -647,7 +647,7 @@ function tmgmt_write_request_messages(JobInterface $job) {
     }
     if ($text = $message->getMessage()) {
       // @todo Verify if this usage is correct.
-      drupal_set_message(SafeMarkup::xssFilter($text), $message->getType());
+      drupal_set_message($text, $message->getType());
     }
   }
   return !$errors;
diff --git a/translators/tmgmt_file/src/Plugin/tmgmt/Translator/FileTranslator.php b/translators/tmgmt_file/src/Plugin/tmgmt/Translator/FileTranslator.php
index e8e8213..a2600ec 100644
--- a/translators/tmgmt_file/src/Plugin/tmgmt/Translator/FileTranslator.php
+++ b/translators/tmgmt_file/src/Plugin/tmgmt/Translator/FileTranslator.php
@@ -10,6 +10,7 @@ namespace Drupal\tmgmt_file\Plugin\tmgmt\Translator;
 use Drupal\tmgmt\JobInterface;
 use Drupal\tmgmt\TranslatorInterface;
 use Drupal\tmgmt\TranslatorPluginBase;
+use Drupal\Core\Url;
 
 /**
  * File translator.
@@ -44,7 +45,9 @@ class FileTranslator extends TranslatorPluginBase {
     if (file_prepare_directory($dirname, FILE_CREATE_DIRECTORY)) {
       $file = file_save_data($export->export($job), $path);
       \Drupal::service('file.usage')->add($file, 'tmgmt_file', 'tmgmt_job', $job->id());
-      $job->submitted('Exported file can be downloaded <a href="!link">here</a>.', array('!link' => file_create_url($path)));
+      $url = Url::fromuri(file_create_url($path));
+      $message = t('Exported file can be downloaded @here.', array('@here' => \Drupal::l(t('here'), $url)));
+      $job->submitted($message);
     }
   }