diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 616c5c248..63a48d501 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -828,6 +828,104 @@ class SeedDMS_Core_DMS {
 		return $version;
 	} /* }}} */
 
+	/**
+	 * Returns all documents with a predefined search criteria
+	 *
+	 * @param string $listtype type of document list, can be 'AppRevByMe',
+	 * 'AppRevOwner', 'ReceiptByMe', 'ReviseByMe', 'LockedByMe', 'MyDocs'
+	 * @param object $user user
+	 * @return array list of documents records
+	 */
+	function countTasks($listtype, $user=null) { /* {{{ */
+		$groups = array();
+		if($user) {
+			$tmp = $user->getGroups();
+			foreach($tmp as $group)
+				$groups[] = $group->getID();
+		}
+		$selectStr = "SELECT count(*) c ";
+		$queryStr = 
+			"FROM `ttcontentid` ".
+			"LEFT JOIN `tblDocumentStatus` ON `tblDocumentStatus`.`documentID`=`ttcontentid`.`document` AND `tblDocumentStatus`.`version`=`ttcontentid`.`maxVersion` ".
+			"LEFT JOIN `ttstatid` ON `ttstatid`.`statusID` = `tblDocumentStatus`.`statusID` ".
+			"LEFT JOIN `tblDocumentStatusLog` ON `ttstatid`.`statusID` = `tblDocumentStatusLog`.`statusID` AND `ttstatid`.`maxLogID` = `tblDocumentStatusLog`.`statusLogID` ";
+		switch($listtype) {
+		case 'ReviewByMe': // Documents I have to review {{{
+			if (!$this->db->createTemporaryTable("ttreviewid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentReviewers` on `ttcontentid`.`document`=`tblDocumentReviewers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentReviewers`.`version` ".
+				"LEFT JOIN `ttreviewid` ON `ttreviewid`.`reviewID` = `tblDocumentReviewers`.`reviewID` ".
+				"LEFT JOIN `tblDocumentReviewLog` ON `tblDocumentReviewLog`.`reviewLogID`=`ttreviewid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentReviewers`.`type` = 0 AND `tblDocumentReviewers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentReviewers`.`type` = 1 AND `tblDocumentReviewers`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentReviewLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_REV.", ".S_EXPIRED.") ";
+			break; /* }}} */
+		case 'ApproveByMe': // Documents I have to approve {{{
+			if (!$this->db->createTemporaryTable("ttapproveid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentApprovers` on `ttcontentid`.`document`=`tblDocumentApprovers`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentApprovers`.`version` ".
+				"LEFT JOIN `ttapproveid` ON `ttapproveid`.`approveID` = `tblDocumentApprovers`.`approveID` ".
+				"LEFT JOIN `tblDocumentApproveLog` ON `tblDocumentApproveLog`.`approveLogID`=`ttapproveid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentApprovers`.`type` = 0 AND `tblDocumentApprovers`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentApprovers`.`type` = 1 AND `tblDocumentApprovers`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentApproveLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_DRAFT_APP.", ".S_EXPIRED.") ";
+			break; /* }}} */
+		case 'ReceiptByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttreceiptid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRecipients` on `ttcontentid`.`document`=`tblDocumentRecipients`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRecipients`.`version` ".
+				"LEFT JOIN `ttreceiptid` ON `ttreceiptid`.`receiptID` = `tblDocumentRecipients`.`receiptID` ".
+				"LEFT JOIN `tblDocumentReceiptLog` ON `tblDocumentReceiptLog`.`receiptLogID`=`ttreceiptid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentRecipients`.`type` = 0 AND `tblDocumentRecipients`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentReceiptLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_RELEASED.") ";
+			break; /* }}} */
+		case 'ReviseByMe': // Documents I have to receipt {{{
+			if (!$this->db->createTemporaryTable("ttrevisionid")) {
+				return false;
+			}
+			$queryStr .=
+				"LEFT JOIN `tblDocumentRevisors` on `ttcontentid`.`document`=`tblDocumentRevisors`.`documentID` AND `ttcontentid`.`maxVersion`=`tblDocumentRevisors`.`version` ".
+				"LEFT JOIN `ttrevisionid` ON `ttrevisionid`.`revisionID` = `tblDocumentRevisors`.`revisionID` ".
+				"LEFT JOIN `tblDocumentRevisionLog` ON `tblDocumentRevisionLog`.`revisionLogID`=`ttrevisionid`.`maxLogID` ";
+
+			$queryStr .= "WHERE (`tblDocumentRevisors`.`type` = 0 AND `tblDocumentRevisors`.`required` = ".$user->getID()." ";
+			if($groups)
+				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).") ";
+			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentRevisionLog`.`status` = 0 ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` IN (".S_IN_REVISION.") ";
+			break; /* }}} */
+		}
+		if($queryStr) {
+			$resArr = $this->db->getResultArray($selectStr.$queryStr);
+			if (is_bool($resArr) && !$resArr) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+		return $resArr[0]['c'];
+	} /* }}} */
+
 	/**
 	 * Returns all documents with a predefined search criteria
 	 *
@@ -1149,6 +1247,7 @@ class SeedDMS_Core_DMS {
 			if($groups)
 				$queryStr .= "OR `tblDocumentRecipients`.`type` = 1 AND `tblDocumentRecipients`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_RELEASED." ";
 			if(!$param2)
 				$queryStr .= " AND `tblDocumentReceiptLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";
@@ -1222,6 +1321,7 @@ class SeedDMS_Core_DMS {
 			if($groups)
 				$queryStr .= "OR `tblDocumentRevisors`.`type` = 1 AND `tblDocumentRevisors`.`required` IN (".implode(',', $groups).")";
 			$queryStr .= ") ";
+			$queryStr .= "AND `tblDocumentStatusLog`.`status` = ".S_IN_REVISION." ";
 			if(!$param2)
 				$queryStr .= " AND `tblDocumentRevisionLog`.`status` = 0 ";
 			if ($orderby=='e') $queryStr .= "ORDER BY `expires`";