diff --git a/src/app/components/wysiwyg/wysiwyg.component.ts b/src/app/components/wysiwyg/wysiwyg.component.ts
index e9a6d0a..c030939 100644
--- a/src/app/components/wysiwyg/wysiwyg.component.ts
+++ b/src/app/components/wysiwyg/wysiwyg.component.ts
@@ -84,8 +84,16 @@ export class WysiwygComponent implements OnInit {
     }
 
     public get displayContents() {
-        return (this.contents || 'Double-click to edit...').replace(/</g, '\n<')
-            .replace(/(https?:\/\/[^\s]+)/g, (val) => `<a href="${val}" target="_blank">${val}</a>`);
+        return this.replaceLinks((this.contents || 'Double-click to edit...').replace(/</g, '\n<'));
+    }
+
+    private replaceLinks(text) {
+        const exp = /((href|src)=["']|)(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
+        return text.replace(exp, (...args) => {
+            return  args[2] ?
+                args[0] :
+                '<a href="' + args[3] + '" target="_blank">' + args[3] + '</a>';
+        });
     }
 
     constructor(