diff --git a/src/components/message/Message.tsx b/src/components/message/Message.tsx
index 79cf8c8d..38ab79c0 100644
--- a/src/components/message/Message.tsx
+++ b/src/components/message/Message.tsx
@@ -1,6 +1,5 @@
 import React, { FC, useState } from 'react'
 import { Message as MessageType } from '../../api/Message'
-import { replaceMagic } from '../../lib/replaceLinksHelper'
 import MessageModalDelete from './MessageModalDelete'
 import MessageMap from './MessageMap'
 import { Ticker } from '../../api/Ticker'
@@ -32,7 +31,7 @@ const Message: FC<Props> = ({ message, ticker }) => {
         <MessageModalDelete message={message} onClose={() => setDeleteModalOpen(false)} open={deleteModalOpen} />
         <p
           dangerouslySetInnerHTML={{
-            __html: replaceMagic(message.text),
+            __html: message.text.replace(/(?:\r\n|\r|\n)/g, '<br/>'),
           }}
           style={{ paddingRight: theme.spacing(6) }}
         />
diff --git a/src/lib/replaceLinksHelper.test.ts b/src/lib/replaceLinksHelper.test.ts
deleted file mode 100644
index 4ab52375..00000000
--- a/src/lib/replaceLinksHelper.test.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { replaceMagic } from './replaceLinksHelper'
-
-describe('helper', function () {
-  test('replace links', function () {
-    const text = 'https://www.systemli.org'
-
-    expect(replaceMagic(text)).toBe('<a href="https://www.systemli.org" target="_blank" rel="noopener noreferrer">www.systemli.org</a>')
-  })
-
-  test('replace twitter hashtag', function () {
-    const text = '#hashtag'
-
-    expect(replaceMagic(text)).toBe('<a target="_blank" rel="noopener noreferrer" href="https://twitter.com/search?q=%23hashtag">#hashtag</a>')
-  })
-
-  test('replace twitter user handle', function () {
-    const text = '/cc @systemli'
-
-    expect(replaceMagic(text)).toBe('/cc <a target="_blank" rel="noopener noreferrer" href="https://twitter.com/systemli">@systemli</a>')
-  })
-
-  test('replace email address', function () {
-    const text = 'sent mail to admin@systemli.org'
-
-    expect(replaceMagic(text)).toBe('sent mail to <a href="mailto:admin@systemli.org">admin@systemli.org</a>')
-  })
-
-  test('replace newline with <br/> tag', function () {
-    const text = 'newline\nnewtext\r\n'
-
-    expect(replaceMagic(text)).toBe('newline<br/>newtext<br/>')
-  })
-})
diff --git a/src/lib/replaceLinksHelper.ts b/src/lib/replaceLinksHelper.ts
deleted file mode 100644
index 6af9d4b3..00000000
--- a/src/lib/replaceLinksHelper.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// FIXME: Might be better to use a library like validator.js
-// to catch more cases.
-export const replaceMagic = (text: string): string => {
-  return text
-    ? text
-        .replace(/(https?:\/\/([a-zA-Z0-9._\-/]+))/g, '<a href="$1" target="_blank" rel="noopener noreferrer">$2</a>')
-        .replace(/#(\S+)/g, '<a target="_blank" rel="noopener noreferrer" href="https://twitter.com/search?q=%23$1">#$1</a>')
-        .replace(/ @(\S+)/g, ' <a target="_blank" rel="noopener noreferrer" href="https://twitter.com/$1">@$1</a>')
-        .replace(/([a-zA-Z0-9_\-.]+@[a-zA-Z0-9_-]+.[a-zA-Z]+)/g, '<a href="mailto:$1">$1</a>')
-        .replace(/(?:\r\n|\r|\n)/g, '<br/>')
-    : ''
-}