diff --git a/include/utils/EmailTemplate.php b/include/utils/EmailTemplate.php
index 8e57aaaa13b50c9014297c7da34ff01e296d71bc..634ac239feea4535f6999a095ad470953d35ef62 100644
--- a/include/utils/EmailTemplate.php
+++ b/include/utils/EmailTemplate.php
@@ -99,7 +99,7 @@ class EmailTemplate {
 		$baseTable = $meta->getEntityBaseTable();
 		$tableList[$baseTable] = $baseTable;
 		
-		if (count($variableList) > 0) {
+		if (!empty($variableList) && (count($variableList) > 0)) {
 			foreach ($variableList as $column) {
 				if (in_array($column, $allColumnList)) {
 					$fieldList[] = array_search($column, $fieldColumnMapping);
diff --git a/modules/Documents/models/Record.php b/modules/Documents/models/Record.php
index c87e720781ac0bcc00de464490d6bc9df566fbae..84b46ce7a68112990c88bd1906cbd6e6a8b75a0b 100644
--- a/modules/Documents/models/Record.php
+++ b/modules/Documents/models/Record.php
@@ -18,7 +18,7 @@ class Documents_Record_Model extends Vtiger_Record_Model {
 		return Vtiger_Util_Helper::getRecordName($this->getId());
 	}
 
-	function getDownloadFileURL() {
+	function getDownloadFileURL($attachmentId = false) {
 		if ($this->get('filelocationtype') == 'I') {
 			$fileDetails = $this->getFileDetails();
 			return 'index.php?module='. $this->getModuleName() .'&action=DownloadFile&record='. $this->getId() .'&fileid='. $fileDetails['attachmentsid'].'&name='. $fileDetails['name'];
@@ -52,7 +52,7 @@ class Documents_Record_Model extends Vtiger_Record_Model {
 		return $returnValue;
 	}
 
-	function getFileDetails() {
+	function getFileDetails($attachmentId = false) {
 		$db = PearDatabase::getInstance();
 		$fileDetails = array();
 
@@ -66,7 +66,7 @@ class Documents_Record_Model extends Vtiger_Record_Model {
 		return $fileDetails;
 	}
 
-	function downloadFile() {
+	function downloadFile($attachmentId = false) {
 		$fileDetails = $this->getFileDetails();
 		$fileContent = false;
 
diff --git a/modules/Documents/views/List.php b/modules/Documents/views/List.php
index 60cc0d8f1692974f0792d814a1cd84d36fefe37b..4cf4e20188d252f7e2ff5d981c35a81b2768f478 100644
--- a/modules/Documents/views/List.php
+++ b/modules/Documents/views/List.php
@@ -24,7 +24,7 @@ class Documents_List_View extends Vtiger_List_View {
 	public function checkPermission(Vtiger_Request $request) {
 		return parent::checkPermission($request);
 	}
-	function preProcess (Vtiger_Request $request) {
+	function preProcess (Vtiger_Request $request, $display=true) {
 		$viewer = $this->getViewer ($request);
 		$moduleName = $request->getModule();
 
diff --git a/modules/Emails/models/Record.php b/modules/Emails/models/Record.php
index dd3b02e55fb128f7b0af9335e0c6e239e3dd31ba..11fe808dd6baa4a3c89b53681bc5a6a1d45212f9 100644
--- a/modules/Emails/models/Record.php
+++ b/modules/Emails/models/Record.php
@@ -79,6 +79,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
 		// Merge Users module merge tags based on current user.
 		$mergedDescription = getMergedDescription($this->get('description'), $currentUserModel->getId(), 'Users');
 		$mergedSubject = getMergedDescription($this->get('subject'),$currentUserModel->getId(), 'Users');
+                $selectedIds = array();
         
         // push all emails to one single array
 		foreach($toEmailInfo as $selectedId => $selectedEmails) {