diff --git a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
index 53fe713f00a837c1931303dc011f49a4af4ee17c..24a993b063ed5e738eab0562cef3752192620e9a 100644
--- a/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
+++ b/entity/UniversalFileProcessor_entity/entityfields/drop_action/onActionProcess.js
@@ -23,8 +23,10 @@ for (var i = 0, l = files.length; i < l; i++)
     vars.set("$field.INFO", translate.withArguments("processing %0/%1", [i.toString(), l.toString()]) + " . . .");
     switch (files[i].mimeType)
     {
-        case "application/octet-stream"://.msg-files will not get any mimetype from the browser so let's use 
+        case "application/vnd.ms-outlook":
+        case "application/octet-stream"://in some cases .msg-files will not get any mimetype from the browser so let's use the default "anything"
         case "message/rfc822":
+        case "text/html": //in some cases .eml-files are recognized as text/html, till this is fixed accept the text/html contents too
             var mailObj = _getMailObj(files[i]);
             if (mailObj)
             {
@@ -57,7 +59,7 @@ if (messages.length)
 function _getMailObj(pDroppedFile)
 {
     var mailStr;
-    if (pDroppedFile.mimeType == "message/rfc822")
+    if (pDroppedFile.mimeType == "message/rfc822" || pDroppedFile.mimeType == "text/html")
         mailStr = util.decodeBase64String(pDroppedFile.data);
     else
     {