diff --git a/src/components/board/TimelineTabSidebard.vue b/src/components/board/TimelineTabSidebard.vue
index 8fae09408..f5daf4d2d 100644
--- a/src/components/board/TimelineTabSidebard.vue
+++ b/src/components/board/TimelineTabSidebard.vue
@@ -1,9 +1,11 @@
 <template>
 	<div>
-		<div v-for="entry in boardActivity" :key="entry.activity_id">
+		<div v-if="isLoading" class="icon icon-loading" />
+
+		<div v-for="entry in boardActivity" v-else :key="entry.activity_id">
 			<img :src="entry.icon">
-			{{ entry.subject }}
-			{{ getTime(entry.datetime) }}
+			<span v-html="parseMessage(entry)" />
+			<span> {{ getTime(entry.datetime) }} </span>
 		</div>
 		<button @click="loadMore">Load More</button>
 	</div>
@@ -57,6 +59,15 @@ export default {
 
 			this.params.since = aId
 			this.loadBoardActivity()
+		},
+		parseMessage(activity) {
+			let subject = activity.subject_rich[0]
+			let parameters = activity.subject_rich[1]
+			if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) {
+				let dateTime = parameters.after.id.substr(3)
+				parameters.after.name = window.moment(dateTime).format('L LTS')
+			}
+			return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters)
 		}
 	}
 }
diff --git a/src/components/card/CardSidebar.vue b/src/components/card/CardSidebar.vue
index 4ec440abb..a5199fecc 100644
--- a/src/components/card/CardSidebar.vue
+++ b/src/components/card/CardSidebar.vue
@@ -41,7 +41,7 @@
 					</multiselect>
 				</div>
 			</div>
-				
+
 			<div class="section-wrapper">
 				<div v-tooltip="t('deck', 'Assign to users')" class="section-label icon-group"><span class="hidden-visually">{{ t('deck', 'Assign to users') }}</span></div>
 				<div class="section-details">
@@ -77,7 +77,9 @@
 			</button>
 		</AppSidebarTab>
 		<AppSidebarTab :order="2" name="Timeline" icon="icon-activity">
-			<div v-for="entry in cardActivity" :key="entry.activity_id">
+
+			<div v-if="isLoading" class="icon icon-loading" />
+			<div v-for="entry in cardActivity" v-else :key="entry.activity_id">
 				<img :src="entry.icon">
 				{{ entry.subject }}
 				{{ getTime(entry.datetime) }}
diff --git a/templates/main.php b/templates/main.php
index d359d97e7..24c252935 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -23,6 +23,10 @@
 
 use OCP\Util;
 
+Util::addScript('activity', 'richObjectStringParser');
+Util::addScript('activity', 'templates');
+Util::addStyle('activity', 'style');
+
 style('deck', 'globalstyles');
 script('deck', 'deck');