diff --git a/layouts/v7/modules/Vtiger/ListViewActions.tpl b/layouts/v7/modules/Vtiger/ListViewActions.tpl
index 515ff6ee1f3847cb88072070c33e428ab4e2fcd2..979c6cd1fbf973de92efb2223671100de17cf3ed 100644
--- a/layouts/v7/modules/Vtiger/ListViewActions.tpl
+++ b/layouts/v7/modules/Vtiger/ListViewActions.tpl
@@ -59,16 +59,18 @@
                             {if count($LISTVIEW_MASSACTIONS_1) gt 0 and $LISTVIEW_LINKS['LISTVIEW']|@count gt 0}
                                 <li class="divider hide"></li>
                             {/if}
-                            <li class="hide">
-                                <a id="{$MODULE}_listView_massAction_LBL_ADD_STAR" onclick="Vtiger_List_Js.triggerAddStar()">
-                                    {vtranslate('LBL_FOLLOW',$MODULE)}
-                                </a>
-                            </li>
-                            <li class="hide">
-                                <a id="{$MODULE}_listView_massAction_LBL_REMOVE_STAR" onclick="Vtiger_List_Js.triggerRemoveStar()">
-                                    {vtranslate('LBL_UNFOLLOW',$MODULE)}
-                                </a>
-                            </li>
+							{if $MODULE_MODEL->isStarredEnabled()}
+								<li class="hide">
+									<a id="{$MODULE}_listView_massAction_LBL_ADD_STAR" onclick="Vtiger_List_Js.triggerAddStar()">
+										{vtranslate('LBL_FOLLOW',$MODULE)}
+									</a>
+								</li>
+								<li class="hide">
+									<a id="{$MODULE}_listView_massAction_LBL_REMOVE_STAR" onclick="Vtiger_List_Js.triggerRemoveStar()">
+										{vtranslate('LBL_UNFOLLOW',$MODULE)}
+									</a>
+								</li>
+							{/if}
                             <li class="hide">
                                 <a id="{$MODULE}_listView_massAction_LBL_ADD_TAG" onclick="Vtiger_List_Js.triggerAddTag()">
                                     {vtranslate('LBL_ADD_TAG',$MODULE)}
diff --git a/modules/Vtiger/models/Module.php b/modules/Vtiger/models/Module.php
index 80af99b7a410becb49c9c6274dfe0d291798cb88..793e8e604442a79e93ad21246eefee365d83f58e 100644
--- a/modules/Vtiger/models/Module.php
+++ b/modules/Vtiger/models/Module.php
@@ -1935,7 +1935,7 @@ class Vtiger_Module_Model extends Vtiger_Module {
 	}
 
 	function isStarredEnabled(){
-		return true;
+		return false;
 	}
 
 	/**
diff --git a/vtigerversion.php b/vtigerversion.php
index 4d0cd33577c266c2510c751761a8302653d6d3e7..4f00663a29b3c9d633ee47eb23304d092f3a05ae 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
  * All Rights Reserved.
  ************************************************************************************/
 
-$patch_version = '-20170523'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20170523'; // -ve timestamp before release, +ve timestamp after release.
 $modified_database = '';
 $vtiger_current_version = '7.0.0';
 $_SESSION['vtiger_version'] = $vtiger_current_version;