diff --git a/action.php b/action.php
index b359269..1bc37c8 100644
--- a/action.php
+++ b/action.php
@@ -39,7 +39,7 @@ switch ($VARS['action']) {
         if (is_empty($msg)) {
             die();
         }
-        $database->insert('messages', ['messagetext' => $msg, '#messagedate' => 'NOW()', 'from' => $_SESSION['uid'], 'to' => $to]);
+        $database->insert('messages', ['messagetext' => $msg, 'messagedate' => date("Y-m-d H:i:s"), 'from' => $_SESSION['uid'], 'to' => $to]);
         break;
     case "delmsg":
         header('HTTP/1.0 204 No Content');
@@ -62,7 +62,7 @@ switch ($VARS['action']) {
             die('You are not assigned to this task!');
         }
         header('HTTP/1.0 204 No Content');
-        $database->update('assigned_tasks', ['#starttime' => 'NOW()', 'statusid' => 1], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
+        $database->update('assigned_tasks', ['starttime' => date("Y-m-d H:i:s"), 'statusid' => 1], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
         break;
     case "resume":
         if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid'], 'starttime[!]' => null]])) {
@@ -76,7 +76,7 @@ switch ($VARS['action']) {
         if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) {
             die('You are not assigned to this task!');
         }
-        $database->update('assigned_tasks', ['#endtime' => 'NOW()', 'statusid' => 2], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
+        $database->update('assigned_tasks', ['endtime' => date("Y-m-d H:i:s"), 'statusid' => 2], ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]]);
         break;
     case "pause":
         if (!$database->has('assigned_tasks', ["AND" => ['taskid' => $VARS['taskid'], 'userid' => $_SESSION['uid']]])) {
diff --git a/database.mwb b/database.mwb
index 39e4e86..f4574db 100644
Binary files a/database.mwb and b/database.mwb differ
diff --git a/lib/getmsgs.php b/lib/getmsgs.php
index 59a86e2..5e57ae6 100644
--- a/lib/getmsgs.php
+++ b/lib/getmsgs.php
@@ -46,7 +46,7 @@ if (count($messages) > 0) {
         }
         ?>
         <div class="panel panel-default">
-            <div class="panel-body">
+            <div class="panel-body message-content">
                 <?php echo strip_tags($msg['text']); ?>
             </div>
             <div class="panel-footer">
diff --git a/lib/gettaskman.php b/lib/gettaskman.php
index d967c15..3a3c0f7 100644
--- a/lib/gettaskman.php
+++ b/lib/gettaskman.php
@@ -87,7 +87,7 @@ if (count($tasks) > 0) {
                     ?>
                 </h3>
             </div>
-            <div class='panel-body'>
+            <div class='panel-body task-description'>
                 <?php echo $task['desc'] ?> 
             </div>
             <div class='panel-footer'>
diff --git a/lib/gettasks.php b/lib/gettasks.php
index 018541b..209d87f 100644
--- a/lib/gettasks.php
+++ b/lib/gettasks.php
@@ -42,7 +42,7 @@ if (count($tasks) > 0) {
                     ?>
                 </h3>
             </div>
-            <div class='panel-body'>
+            <div class='panel-body task-description'>
                 <?php echo $task['taskdesc'] ?>
             </div>
             <div class='panel-footer'>
diff --git a/static/css/app.css b/static/css/app.css
index 03a1011..bee1d9e 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -12,4 +12,13 @@
 .footer {
     margin-top: 10em;
     text-align: center;
+}
+
+.message-content {
+    overflow-wrap: break-word;
+}
+
+.task-description {
+    /* Using !important in case a "smart" guy messes with inline CSS, to make his life harder */
+    overflow-wrap: break-word !important;
 }
\ No newline at end of file