diff --git a/app/docker/components/log-viewer/log-viewer.js b/app/docker/components/log-viewer/log-viewer.js
index 5c7dc6d6c..3788cf2be 100644
--- a/app/docker/components/log-viewer/log-viewer.js
+++ b/app/docker/components/log-viewer/log-viewer.js
@@ -3,6 +3,7 @@ angular.module('portainer.docker').component('logViewer', {
   controller: 'LogViewerController',
   bindings: {
     data: '=',
+    displayTimestamps: '=',
     logCollectionChange: '<'
   }
 });
diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html
index c51029ec2..996bf5e8d 100644
--- a/app/docker/components/log-viewer/logViewer.html
+++ b/app/docker/components/log-viewer/logViewer.html
@@ -15,6 +15,16 @@
               </label>
             </div>
           </div>
+          <div class="form-group">
+            <div class="col-sm-12">
+              <label for="tls" class="control-label text-left">
+                Display timestamps
+              </label>
+              <label class="switch" style="margin-left: 20px;">
+               <input type="checkbox" ng-model="$ctrl.displayTimestamps"><i></i>
+               </label>
+            </div>
+          </div>
           <div class="form-group">
             <label for="logs_search" class="col-sm-1 control-label text-left">
               Search
diff --git a/app/docker/views/containers/logs/containerLogsController.js b/app/docker/views/containers/logs/containerLogsController.js
index c874d2db8..ba2f661ff 100644
--- a/app/docker/views/containers/logs/containerLogsController.js
+++ b/app/docker/views/containers/logs/containerLogsController.js
@@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, ContainerService, Notifications) {
   $scope.state = {
     refreshRate: 3,
-    lineCount: 2000
+    lineCount: 2000,
+    displayTimestamps: false
   };
 
   $scope.changeLogCollection = function(logCollectionStatus) {
@@ -33,7 +34,7 @@ function ($scope, $transition$, $interval, ContainerService, Notifications) {
   function setUpdateRepeater() {
     var refreshRate = $scope.state.refreshRate;
     $scope.repeater = $interval(function() {
-      ContainerService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+      ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
       .then(function success(data) {
         $scope.logs = data;
       })
@@ -45,7 +46,7 @@ function ($scope, $transition$, $interval, ContainerService, Notifications) {
   }
 
   function startLogPolling() {
-    ContainerService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+    ContainerService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
     .then(function success(data) {
       $scope.logs = data;
       setUpdateRepeater();
diff --git a/app/docker/views/containers/logs/containerlogs.html b/app/docker/views/containers/logs/containerlogs.html
index 48d0ef68e..21d1632dd 100644
--- a/app/docker/views/containers/logs/containerlogs.html
+++ b/app/docker/views/containers/logs/containerlogs.html
@@ -6,5 +6,5 @@
 </rd-header>
 
 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps"
 ></log-viewer>
diff --git a/app/docker/views/services/logs/serviceLogsController.js b/app/docker/views/services/logs/serviceLogsController.js
index 47fd117d0..1e44ebb31 100644
--- a/app/docker/views/services/logs/serviceLogsController.js
+++ b/app/docker/views/services/logs/serviceLogsController.js
@@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, ServiceService, Notifications) {
   $scope.state = {
     refreshRate: 3,
-    lineCount: 2000
+    lineCount: 2000,
+    displayTimestamps: false
   };
 
   $scope.changeLogCollection = function(logCollectionStatus) {
@@ -29,7 +30,7 @@ function ($scope, $transition$, $interval, ServiceService, Notifications) {
   function setUpdateRepeater() {
     var refreshRate = $scope.state.refreshRate;
     $scope.repeater = $interval(function() {
-      ServiceService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+      ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
       .then(function success(data) {
         $scope.logs = data;
       })
@@ -41,7 +42,7 @@ function ($scope, $transition$, $interval, ServiceService, Notifications) {
   }
 
   function startLogPolling() {
-    ServiceService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+    ServiceService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
     .then(function success(data) {
       $scope.logs = data;
       setUpdateRepeater();
diff --git a/app/docker/views/services/logs/servicelogs.html b/app/docker/views/services/logs/servicelogs.html
index 07ed352c3..3a599b091 100644
--- a/app/docker/views/services/logs/servicelogs.html
+++ b/app/docker/views/services/logs/servicelogs.html
@@ -6,5 +6,5 @@
 </rd-header>
 
 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps"
 ></log-viewer>
diff --git a/app/docker/views/tasks/logs/taskLogsController.js b/app/docker/views/tasks/logs/taskLogsController.js
index e578c5d7a..c25e1b1c2 100644
--- a/app/docker/views/tasks/logs/taskLogsController.js
+++ b/app/docker/views/tasks/logs/taskLogsController.js
@@ -3,7 +3,8 @@ angular.module('portainer.docker')
 function ($scope, $transition$, $interval, TaskService, ServiceService, Notifications) {
   $scope.state = {
     refreshRate: 3,
-    lineCount: 2000
+    lineCount: 2000,
+    displayTimestamps: false
   };
 
   $scope.changeLogCollection = function(logCollectionStatus) {
@@ -29,7 +30,7 @@ function ($scope, $transition$, $interval, TaskService, ServiceService, Notifica
   function setUpdateRepeater() {
     var refreshRate = $scope.state.refreshRate;
     $scope.repeater = $interval(function() {
-      TaskService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+      TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
       .then(function success(data) {
         $scope.logs = data;
       })
@@ -41,7 +42,7 @@ function ($scope, $transition$, $interval, TaskService, ServiceService, Notifica
   }
 
   function startLogPolling() {
-    TaskService.logs($transition$.params().id, 1, 1, 0, $scope.state.lineCount)
+    TaskService.logs($transition$.params().id, 1, 1, $scope.state.displayTimestamps ? 1 : 0, $scope.state.lineCount)
     .then(function success(data) {
       $scope.logs = data;
       setUpdateRepeater();
diff --git a/app/docker/views/tasks/logs/tasklogs.html b/app/docker/views/tasks/logs/tasklogs.html
index d86db0f92..ae8e5056d 100644
--- a/app/docker/views/tasks/logs/tasklogs.html
+++ b/app/docker/views/tasks/logs/tasklogs.html
@@ -6,5 +6,5 @@
 </rd-header>
 
 <log-viewer
-  data="logs" ng-if="logs" log-collection-change="changeLogCollection"
+  data="logs" ng-if="logs" log-collection-change="changeLogCollection" display-timestamps="state.displayTimestamps"
 ></log-viewer>