diff --git a/layouts/v7/modules/Calendar/ListViewRecordActions.tpl b/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
index e98941b30b68515b8362b79d643c6caff65017ab..4940f5c959f73739e63368097d721875e05db5c4 100644
--- a/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Calendar/ListViewRecordActions.tpl
@@ -22,7 +22,9 @@
 		{if $QUICK_PREVIEW_ENABLED eq 'true'}
 			<span class="quickView fa fa-eye icon action" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
 		{/if}
-		<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+		{if $MODULE_MODEL->isStarredEnabled()}
+			<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+		{/if}
 		{assign var=EDIT_VIEW_URL value={$LISTVIEW_ENTRY->getEditViewUrl()}}
 		{if $IS_MODULE_EDITABLE && $EDIT_VIEW_URL && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Held', $MODULE) && $LISTVIEW_ENTRY->get('taskstatus') neq vtranslate('Completed', $MODULE)}
 			<span class="fa fa-check icon action" title="{vtranslate('LBL_MARK_AS_HELD', $MODULE)}" onclick="Calendar_Calendar_Js.markAsHeld('{$LISTVIEW_ENTRY->getId()}');"></span>
diff --git a/layouts/v7/modules/Documents/ListViewRecordActions.tpl b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
index ac0662fecdad58eac9520c8428154467a15b6779..81ea8da849e176117b52a2e1929b4d4d0c97291c 100644
--- a/layouts/v7/modules/Documents/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Documents/ListViewRecordActions.tpl
@@ -20,7 +20,9 @@
     {else}
         {assign var=STARRED value=false}
     {/if}
-    <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+	{if $MODULE_MODEL->isStarredEnabled()}
+		<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+	{/if}
     <span class="more dropdown action">
         <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-ellipsis-v icon"></i></a>
         <ul class="dropdown-menu">
diff --git a/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl b/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
index 7edcd662866f16bc41adc28a1035e533a7279d8a..c50779526411eab6597fb1d1e83413d434805693 100644
--- a/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
+++ b/layouts/v7/modules/Vtiger/ListViewRecordActions.tpl
@@ -23,7 +23,9 @@
     {if $QUICK_PREVIEW_ENABLED eq 'true'}
         <span class="quickView fa fa-eye icon action" data-app="{$SELECTED_MENU_CATEGORY}" title="{vtranslate('LBL_QUICK_VIEW', $MODULE)}"></span>
     {/if}
-    <span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+	{if $MODULE_MODEL->isStarredEnabled()}
+		<span class="markStar fa icon action {if $STARRED} fa-star active {else} fa-star-o{/if}" title="{if $STARRED} {vtranslate('LBL_STARRED', $MODULE)} {else} {vtranslate('LBL_NOT_STARRED', $MODULE)}{/if}"></span> 
+	{/if}
     <span class="more dropdown action">
         <span href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
             <i class="fa fa-ellipsis-v icon"></i></span>
diff --git a/modules/Settings/MailConverter/models/Field.php b/modules/Settings/MailConverter/models/Field.php
index e5701016f94a68620b443ce1776cbbf8432ecdf4..e7fc94b093e474dd0e1a52290c5121cd52e3c0e5 100644
--- a/modules/Settings/MailConverter/models/Field.php
+++ b/modules/Settings/MailConverter/models/Field.php
@@ -92,6 +92,8 @@ class Settings_MailConverter_Field_Model extends Vtiger_Field_Model {
         }
         return $this->isEditable;
     }
-    
-    
+
+	public function getPicklistColors() {
+		return array();
+	}
 }
\ No newline at end of file
diff --git a/schema/DatabaseSchema.xml b/schema/DatabaseSchema.xml
index 3061ce0bcae0cfcc9f1693bc0031599ae8bb46b5..36430154cb17fca130604c56afc7f0030f7c4676 100644
--- a/schema/DatabaseSchema.xml
+++ b/schema/DatabaseSchema.xml
@@ -6058,7 +6058,7 @@
 		<field name="searchfor" type="C" size="10"></field>
 		<field name="markas" type="C" size="10"></field>
 		<field name="isvalid" type="I" size="1"></field>
-		<field name="scanfrom" type="V" size="10">
+		<field name="scanfrom" type="C" size="10">
 			<default value="ALL" />
 		</field>
 		<opt platform="mysql">Engine=InnoDB</opt>