diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
index 71ccea0f..970be75a 100644
--- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
+++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js
@@ -11,14 +11,14 @@ app.controller('EmailMessageOptionController', function(
 		endDate: moment()
 	};
 	$scope.dtOptions = {
-		timePicker: false,
+		timePicker: true,
 		timePicker24Hour: true,
 		timePickerIncrement: 1,
 		timePickerSeconds: true,
 		startView:2,
 		autoApply: true,
 		locale:{
-			format: 'YYYY-MM-DD',
+			format: 'YYYY-MM-DDTHH:mm:ss',
 			applyLabel: "OK",
 			cancelLabel: "Cancel",
 		},
@@ -32,10 +32,10 @@ app.controller('EmailMessageOptionController', function(
 	$scope.execute = function() {
 		var startdatetime, enddatetime;
 		var query = {
-			startdatetime: $scope.daterange.startDate.format().slice(0, 10),
-			enddatetime: $scope.daterange.endDate.format().slice(0, 10)
+			startdatetime: $scope.daterange.startDate.format().slice(0, 19),
+			enddatetime: $scope.daterange.endDate.format().slice(0, 19)
 		};
-		
+
 		$scope.$emit('handleEmitEmailMessageOptionChanged', {
 			load: true,
 			period:$scope.currentPeriod
diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py
index 4b5b0ed3..050dbfbb 100644
--- a/myems-api/core/emailmessage.py
+++ b/myems-api/core/emailmessage.py
@@ -34,7 +34,7 @@ class EmailMessageCollection:
             start_datetime_local = str.strip(start_datetime_local)
             try:
                 start_datetime_utc = datetime.strptime(start_datetime_local,
-                                                                 '%Y-%m-%d').replace(tzinfo=timezone.utc) - \
+                                                                 '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \
                     timedelta(minutes=timezone_offset)
             except ValueError:
                 raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
@@ -47,9 +47,8 @@ class EmailMessageCollection:
             end_datetime_local = str.strip(end_datetime_local)
             try:
                 end_datetime_utc = datetime.strptime(end_datetime_local,
-                                                               '%Y-%m-%d').replace(tzinfo=timezone.utc) - \
+                                                               '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \
                     timedelta(minutes=timezone_offset)
-                end_datetime_utc += timedelta(days=1)
             except ValueError:
                 raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
                                        description="API.INVALID_END_DATETIME_FORMAT")