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 d9f2bd17..0c811e73 100644
--- a/src/components/TimelineEntry.vue
+++ b/src/components/TimelineEntry.vue
@@ -25,6 +25,7 @@
 
 <script>
 import { Avatar } from 'nextcloud-vue'
+import linkifyStr from 'linkifyjs/string';
 
 export default {
 	name: 'TimelineEntry',
@@ -43,7 +44,7 @@ export default {
 		formatedMessage: function() {
 			let message = this.item.content
 			message = message.replace(/(?:\r\n|\r|\n)/g, '<br />')
-			return message
+			return message.linkify()
 		}
 	}
 }