diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index d857ccff5..decd95ca9 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -172,7 +172,7 @@
       </div>
       <div layout="row" layout-wrap="layout-wrap">
         <div ng-class="part.msgclass" layout="row" layout-wrap="layout-wrap" class="mailer_mailcontent" ng-repeat="part in viewer.message.$content()">
-          <div ng-if="part.html" ng-bind-html="part.content"><!-- msg --></div>
+          <div ng-if="part.html" ng-bind-html="part.content | ensureTarget"><!-- msg --></div>
           <div ng-if="part.compile" sg-compile="part.content"><!-- msg --></div>
         </div>
       </div>
diff --git a/UI/WebServerResources/js/Common/ensureTarget.filter.js b/UI/WebServerResources/js/Common/ensureTarget.filter.js
new file mode 100644
index 000000000..da5ce26a8
--- /dev/null
+++ b/UI/WebServerResources/js/Common/ensureTarget.filter.js
@@ -0,0 +1,22 @@
+/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/**
+ * @type {angular.Module}
+ */
+(function () {
+  'use strict';
+
+  /**
+   * @ngInject
+   */
+  function ensureTarget() {
+    return function(element) {
+      var tree = angular.element('<div>' + element + '</div>');
+      tree.find('a').attr('target', '_blank');
+      return angular.element('<div>').append(tree).html(); 
+    };
+  }
+
+  angular.module('SOGo.Common')
+    .filter('ensureTarget', ensureTarget);
+})();