diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index fe7b1ec3b..3b08baa0a 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -132,9 +132,10 @@ module.exports = function(grunt) {
       '<%= src %>/angular-animate/angular-animate{,.min}.js{,.map}',
       '<%= src %>/angular-sanitize/angular-sanitize{,.min}.js{,.map}',
       '<%= src %>/angular-aria/angular-aria{,.min}.js{,.map}',
+      '<%= src %>/angular-messages/angular-messages{,.min}.js{,.map}',
       '<%= src %>/angular-material/angular-material{,.min}.js{,.map}',
       '<%= src %>/angular-ui-router/release/angular-ui-router{,.min}.js',
-      '<%= src %>/angular-file-upload/dist/angular-file-upload.min.js{,map}',
+      '<%= src %>/angular-file-upload/dist/angular-file-upload{,.min}.js{,.map}',
       //'<%= src %>/ng-file-upload/ng-file-upload{,.min}.js{,map}',
       '<%= src %>/lodash/lodash{,.min}.js'
     ];
diff --git a/UI/WebServerResources/bower.json b/UI/WebServerResources/bower.json
index c2d30840f..1458d0963 100644
--- a/UI/WebServerResources/bower.json
+++ b/UI/WebServerResources/bower.json
@@ -4,6 +4,8 @@
   "devDependencies": {
     "angular": "1.4.x",
     "angular-animate": "1.4.x",
+    "angular-aria": "1.4.x",
+    "angular-messages": "1.4.x",
     "angular-sanitize": "1.4.x",
     "angular-ui-router": "latest",
     "angular-file-upload": "latest",
diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js
index 26dccc6cc..cc70a0b7b 100644
--- a/UI/WebServerResources/js/Common/Common.app.js
+++ b/UI/WebServerResources/js/Common/Common.app.js
@@ -3,7 +3,7 @@
 (function() {
   'use strict';
 
-  angular.module('SOGo.Common', ['ngAnimate', 'ngSanitize', 'ngMaterial', 'mdColors'])
+  angular.module('SOGo.Common', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ngMaterial', 'mdColors'])
     .value('sgSettings', {
       isPopup: document.body.classList.contains('popup'),
       baseURL: function() {