diff --git a/css/style.scss b/css/style.scss
index b62818f36..448adfa50 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -492,7 +492,7 @@ input.input-inline {
 			}
 		}
 
-		.card-tasks, .card-files {
+		.card-tasks, .card-files, .card-comments {
 			border-radius: 3px;
 			margin: 4px 4px 4px 0px;
 			padding: 0 2px;
@@ -937,6 +937,10 @@ input.input-inline {
 	}
 }
 
+.activity-icon {
+	opacity: 1 !important;
+}
+
 .card-attachments {
 	.error {
 		padding-left: 38px;
diff --git a/templates/main.php b/templates/main.php
index 7221882e9..cc6046b6c 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -25,6 +25,8 @@ use OCP\Util;
 
 Util::addScript('activity', 'richObjectStringParser');
 Util::addStyle('activity', 'style');
+Util::addStyle('comments', 'comments');
+Util::addScript('oc-backbone-webdav');
 
 Util::addStyle('deck', '../js/build/vendor');
 Util::addScript('deck', 'build/vendor');
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index fb91b9a01..531498708 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -107,6 +107,10 @@
 								<i class="icon icon-files-dark"></i>
 								<span>{{ attachmentCount(cardservice.get(c.id)) }}</span>
 							</div>
+							<div class="card-comments" ng-if="unreadCommentCount(cardservice.get(c.id)) > 0">
+								<i class="icon icon-comment"></i>
+								<span>{{ unreadCommentCount(cardservice.get(c.id)) }}</span>
+							</div>
 							<div class="card-assigned-users">
 								<div class="assigned-user" ng-repeat="user in cardservice.get(c.id).assignedUsers | limitTo: 3">
 									<avatar data-user="{{ user.participant.uid }}" data-displayname="{{ user.participant.displayname }}" data-tooltip></avatar>
diff --git a/templates/part.card.activity.html b/templates/part.card.activity.html
index 1c8a7198f..8d53ce5a7 100644
--- a/templates/part.card.activity.html
+++ b/templates/part.card.activity.html
@@ -1,14 +1,35 @@
+<div class="icon icon-activity"></div>
+<div class="icon icon-comment"></div>
+<div id="commentsTabView">
+	<div class="newCommentRow comment" data-id="">
+		<div class="authorRow">
+			<div class="avatardiv" avatar ng-attr-user="admin" ng-attr-displayname="Admin"></div>
+			<div class="author currentUser">admin</div>
+		</div>
+		<form class="newCommentForm">
+			<div contenteditable="true" class="message" data-placeholder="{{ $ctrl.t('deck', 'New comment …') }}" ng-model="$ctrl.$scope.newComment"></div>
+			<input class="submit icon-confirm has-tooltip" type="submit"
+				   value="" title="" data-original-title="Post" ng-click="$ctrl.postComment()">
+			<div class="submitLoading icon-loading-small hidden"></div>
+		</form>
+	</div>
+</div>
 <ul class="activities" infinite-scroll="$ctrl.page()" infinite-scroll-container="'#app-sidebar'" infinite-scroll-disabled="$ctrl.activityservice.running" infinite-scroll-immediate-check="false">
 	<li ng-if="$ctrl.loadingNewer()"><div class="icon-loading-small"></div></li>
-	<li class="activity box" ng-repeat="activity in $ctrl.getData($ctrl.element.id) track by $index">
+	<li class="activity box" ng-repeat="activity in $ctrl.getActivityStream() track by $index">
 		<div class="activity-icon">
-			<img src="{{activity.icon}}" alt="">
+			<img ng-if="activity.timelineType == 'activity'" src="{{activity.icon}}" alt="">
+			<div ng-if="activity.timelineType == 'comment'" avatar ng-attr-size="16" ng-attr-user="{{ activity.actorId }}" ng-attr-displayname="{{ activity.actorDisplayName }}"></div>
 		</div>
 		<div class="activitysubject"
+			 ng-if="activity.timelineType == 'activity'"
 			 bind-html-compile="$ctrl.parseMessage(activity.subject_rich[0], activity.subject_rich[1])"></div>
+		<div class="activitysubject"
+			 ng-if="activity.timelineType == 'comment'">{{ activity.subject_rich[1].user.name }}</div>
 		<span class="activitytime has-tooltip live-relative-timestamp"
-			  data-timestamp="{{ activity.timestamp }}">{{ activity.timestamp/1000 | relativeDateFilter }}</span>
+			  data-timestamp="{{ activity.timelineTimestamp }}">{{ activity.timelineTimestamp/1000 | relativeDateFilter }}</span>
 		<div class="activitymessage" ng-bind-html="activity.message"></div>
+		<div id="foobar" ng-click="$ctrl.updateComment(activity)">{{ activity.commentModel }}</div>
 	</li>
 
 	<li ng-if="$ctrl.loading"><div class="icon-loading-small"></div></li>