diff --git a/modules/Calendar/uitypes/Datetime.php b/modules/Calendar/uitypes/Datetime.php
index 3b1c244e5e40e43d83c9c3825dba1a473a5da58e..8c72c809eff2fdc38d0248bb1e880a6215cac4d0 100644
--- a/modules/Calendar/uitypes/Datetime.php
+++ b/modules/Calendar/uitypes/Datetime.php
@@ -13,7 +13,7 @@ class Calendar_Datetime_UIType extends Vtiger_Datetime_UIType {
 	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		//Since date_start and due_date fields of calendar can have time appended or removed
 		if($this->hasTimeComponent($value)) {
-			return self::getDisplayDateTimeValue($value);
+			return parent::getDisplayValue($value);
 		}else{
 			return $this->getDisplayDateValue($value);
 		}
diff --git a/modules/Settings/LayoutEditor/actions/Field.php b/modules/Settings/LayoutEditor/actions/Field.php
index 2e22908e349ed514ed477565c1036104ae8adb57..33569309f79a8af9fa49961653a5234737b719af 100644
--- a/modules/Settings/LayoutEditor/actions/Field.php
+++ b/modules/Settings/LayoutEditor/actions/Field.php
@@ -100,10 +100,6 @@ class Settings_LayoutEditor_Field_Action extends Settings_Vtiger_Index_Action {
 	$defaultValue = $fieldInstance->get('defaultvalue');
         if(!is_null($request->get('fieldDefaultValue', null))) {
             $defaultValue = decode_html($request->get('fieldDefaultValue'));
-            if(preg_match('/AM|PM/',$defaultValue) && ($fieldInstance->get('uitype') =='14'))
-            {
-                $defaultValue=Vtiger_Time_UIType::getTimeValueWithSeconds($defaultValue);
-            }
             $fieldInstance->set('defaultvalue', $defaultValue);
         }
 	$response = new Vtiger_Response();
diff --git a/modules/Settings/MailConverter/handlers/MailScannerAction.php b/modules/Settings/MailConverter/handlers/MailScannerAction.php
index 84e3738f62f0c794fc1e90a8261a2113f09bab1b..f769f16b6993207aacc675bacd3995d6a1ef5a83 100644
--- a/modules/Settings/MailConverter/handlers/MailScannerAction.php
+++ b/modules/Settings/MailConverter/handlers/MailScannerAction.php
@@ -548,8 +548,8 @@ class Vtiger_MailScannerAction {
 
 		$mimetype = MailAttachmentMIME::detect($saveasfile);
 
-		$adb->pquery("INSERT INTO vtiger_attachments SET attachmentsid=?, name=?, description=?, type=?, path=?",
-			Array($attachid, $filename, $description, $mimetype, $dirname));
+		$adb->pquery("INSERT INTO vtiger_attachments SET attachmentsid=?, name=?, description=?, type=?, storedname=?, path=?",
+			Array($attachid, $filename, $description, $mimetype, $filename, $dirname));
 
 		return true;
 	}
diff --git a/modules/com_vtiger_workflow/VTJsonCondition.inc b/modules/com_vtiger_workflow/VTJsonCondition.inc
index 11a11f10e64a062d4843e93cb536c7190fc38a32..210aa5e419b5f90921e8e0bd93a8288e15062abe 100644
--- a/modules/com_vtiger_workflow/VTJsonCondition.inc
+++ b/modules/com_vtiger_workflow/VTJsonCondition.inc
@@ -360,7 +360,7 @@ class VTJsonCondition {
 				}
 				return false;
 			case "is not empty":
-				if(empty($fieldValue)) {
+				if(empty($fieldValue) && $fieldValue!=0) {
 					return false;
 				}
 				return true;