diff --git a/src/Form/JobItemAbortForm.php b/src/Form/JobItemAbortForm.php
index 7b3db1a..984ba18 100644
--- a/src/Form/JobItemAbortForm.php
+++ b/src/Form/JobItemAbortForm.php
@@ -40,17 +40,7 @@ class JobItemAbortForm extends ContentEntityConfirmFormBase {
     $entity = $this->entity;
     try {
       if (!$entity->abortTranslation()) {
-        foreach ($entity->getMessagesSince() as $message) {
-          /** @var \Drupal\tmgmt\MessageInterface $message */
-          if ($message->getType() == 'debug') {
-            continue;
-          }
-          if ($text = $message->getMessage()) {
-            // We want to persist also the type therefore we will set the
-            // messages directly and not return them.
-            drupal_set_message($text, $message->getType());
-          }
-        }
+        tmgmt_write_request_messages($entity);
       }
     }
     catch(TMGMTException $e) {
diff --git a/tmgmt.module b/tmgmt.module
index 0ed7917..1b8a003 100644
--- a/tmgmt.module
+++ b/tmgmt.module
@@ -693,15 +693,15 @@ function tmgmt_job_request_translation(JobInterface $job) {
 /**
  * Print all messages that occurred since our request to the screen.
  *
- * @param \Drupal\tmgmt\JobInterface $job
- *    The translation job for which the message should be written.
+ * @param \Drupal\tmgmt\JobInterface|\Drupal\tmgmt\JobItemInterface $job_or_job_item
+ *    The translation job or job item for which the message should be written.
  *
  * @return bool
  *    FALSE if there are message with severity error, TRUE otherwise.
  */
-function tmgmt_write_request_messages(JobInterface $job) {
+function tmgmt_write_request_messages($job_or_job_item) {
   $errors = FALSE;
-  foreach ($job->getMessagesSince() as $message) {
+  foreach ($job_or_job_item->getMessagesSince() as $message) {
     // Ignore debug messages.
     if ($message->getType() == 'debug') {
       continue;
@@ -813,7 +813,7 @@ function tmgmt_translation_review_form_update_state(array $form, FormStateInterf
     }
   }
   $job_item->save();
-  tmgmt_write_request_messages($job_item->getJob());
+  tmgmt_write_request_messages($job_item);
 }
 
 /**
diff --git a/translators/tmgmt_file/tmgmt_file.module b/translators/tmgmt_file/tmgmt_file.module
index fdf5ffb..8f98a52 100644
--- a/translators/tmgmt_file/tmgmt_file.module
+++ b/translators/tmgmt_file/tmgmt_file.module
@@ -56,15 +56,7 @@ function tmgmt_file_import_form_submit(array $form, FormStateInterface $form_sta
       }
     }
   }
-  foreach ($job->getMessagesSince() as $message) {
-    // Ignore debug messages.
-    if ($message->getType() == 'debug') {
-      continue;
-    }
-    if ($text = $message->getMessage()) {
-      drupal_set_message($text, $message->getType());
-    }
-  }
+  tmgmt_write_request_messages($job);
 }
 
 /**