diff --git a/package.json b/package.json
index 0b0e770b..a1e96ceb 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.0.0",
+		"linkifyjs": "^2.1.7",
 		"nextcloud-axios": "^0.1.2",
 		"nextcloud-vue": "^0.4.2",
 		"uuid": "^3.3.2",
diff --git a/src/components/TimelineEntry.vue b/src/components/TimelineEntry.vue
index 69c96371..0c811e73 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -2,24 +2,30 @@
 	<div class="timeline-entry">
 		<div class="entry-content">
 			<div class="post-avatar">
-				<avatar :size="32" :url="item.authorAvatar" />
+				<avatar :size="32" :user="item.actor_info.preferredUsername" />
 			</div>
 			<div class="post-content">
 				<div class="post-author-wrapper">
-					<router-link :to="{ name: 'profile', params: { account: item.authorId }}">
-						<span class="post-author">{{ item.author }}</span>
-						<span class="post-author-id">{{ item.authorId }}</span>
+					<router-link v-if="item.actor_info.local" :to="{ name: 'profile', params: { account: item.actor_info.preferredUsername }}">
+						<span class="post-author">{{ item.actor_info.preferredUsername }}</span>
+						<span class="post-author-id">{{ item.actor_info.account }}</span>
 					</router-link>
+					<a :href="item.actor_info.url" v-else>
+						<span class="post-author">{{ item.actor_info.preferredUsername }}</span>
+						<span class="post-author-id">{{ item.actor_info.account }}</span>
+					</a>
 				</div>
 				<div class="post-message" v-html="formatedMessage" />
+				<!--<pre style="height: 200px; overflow:scroll;">{{item}}</pre> //-->
 			</div>
-			<div class="post-timestamp">{{ item.timestamp }}</div>
+			<div class="post-timestamp">{{ item.published }}</div>
 		</div>
 	</div>
 </template>
 
 <script>
 import { Avatar } from 'nextcloud-vue'
+import linkifyStr from 'linkifyjs/string';
 
 export default {
 	name: 'TimelineEntry',
@@ -36,9 +42,9 @@ export default {
 	},
 	computed: {
 		formatedMessage: function() {
-			let message = this.item.message
+			let message = this.item.content
 			message = message.replace(/(?:\r\n|\r|\n)/g, '<br />')
-			return message
+			return message.linkify()
 		}
 	}
 }
diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
index 24f5487f..60dd52e4 100644
--- a/src/views/Timeline.vue
+++ b/src/views/Timeline.vue
@@ -27,11 +27,7 @@
 						<div class="submitLoading icon-loading-small hidden" />
 					</form>
 				</div>
-				<!--<timeline-entry v-for="entry in timeline" :item="entry" :key="entry.id" /> //-->
-				<div v-for="entry in timeline">
-					{{entry.content}}
-				<pre style="height: 200px; overflow:scroll;">{{entry}}</pre>
-				</div>
+				<timeline-entry v-for="entry in timeline" :item="entry" :key="entry.id" />
 				<infinite-loading @infinite="infiniteHandler" ref="infiniteLoading">
 				<div slot="spinner"><div class="icon-loading"></div></div>
 				<div slot="no-more"><div class="list-end"></div></div>