diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 01c9afc3980939e9befbc7263aa342ab2853714b..3b6c787474f9d62894930bd45df614b571f13e0c 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 3d03d0b0e5b2074be1d9d87ad55b598239223e80..0d6fa066646efe74f05b48a916605ec4559d8d84 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 99d4ac5891b56cf18e29ed34177632209eae9b21..25fba86b510d41b0281f07505dc5d0466a927205 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index aac17cc1b20056e2eecf40090f5b3bc37ed618ad..305e6af9b448f29549f49ec2b99c64d69fb5b34a 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 00ed194e2f9e328e5844d346fe54627119e13199..2d6b5c91a4832f807b87e540b7753860491f8541 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index 399c4b8a4a487b86f8831e2d857ac366f5a76228..8fe85c5c366d0ac8488c823ed1e1b5bd5a51358b 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index 0d11dd95d08943ee54f0112b43ffbfc3b2a4c781..e0f6331b93629c7edfdc5f2d21300173d040a595 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index 2cbe2844ef83fc0d69d5f3ac79c0728631a23a8c..de1519e8cefbf5ea88a35ab49c7c9f6f68669280 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -795,6 +795,7 @@ a.menu-item:hover {
 .fieldValue .value {
   max-width: 85%;
   display: inline-block;
+  word-break: break-word;
 }
 .modal-header button.close {
   padding: 0;
diff --git a/modules/Settings/MailConverter/views/EditRule.php b/modules/Settings/MailConverter/views/EditRule.php
index 6246de4fb7a8316f936910b2998e467edc59d48a..6721af355b5631c3fd82ee01c396065030c87674 100644
--- a/modules/Settings/MailConverter/views/EditRule.php
+++ b/modules/Settings/MailConverter/views/EditRule.php
@@ -29,6 +29,7 @@ class Settings_MailConverter_EditRule_View extends Settings_Vtiger_IndexAjax_Vie
 			$recordModel = Settings_MailConverter_RuleRecord_Model::getInstanceById($recordId);
 		} else {
 			$recordModel = Settings_MailConverter_RuleRecord_Model::getCleanInstance($scannerId);
+			$recordModel->set('matchusing', 'AND');
 		}
 	
 		$assignedTo = Settings_MailConverter_RuleRecord_Model::getAssignedTo($scannerId, $recordId);