diff --git a/app/assets/javascripts/jquery.timeago.js b/app/assets/javascripts/lib/jquery.timeago.js
similarity index 100%
rename from app/assets/javascripts/jquery.timeago.js
rename to app/assets/javascripts/lib/jquery.timeago.js
diff --git a/app/assets/javascripts/md5.js b/app/assets/javascripts/lib/md5.js
similarity index 100%
rename from app/assets/javascripts/md5.js
rename to app/assets/javascripts/lib/md5.js
diff --git a/app/assets/javascripts/utf8_encode.js b/app/assets/javascripts/lib/utf8_encode.js
similarity index 100%
rename from app/assets/javascripts/utf8_encode.js
rename to app/assets/javascripts/lib/utf8_encode.js
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 9fbb1a2d..b61df846 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -32,6 +32,14 @@ window.disableButtonIfEmptyField = (field_selector, button_selector) ->
else
closest_submit.enable()
+window.sanitize = (str) ->
+ return str.replace(/<(?:.|\n)*?>/gm, '')
+
+window.linkify = (str) ->
+ exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig
+ return str.replace(exp,"$1")
+
+
$ ->
# Click a .one_click_select field, select the contents
$(".one_click_select").on 'click', -> $(@).select()
diff --git a/app/assets/javascripts/wall.js.coffee b/app/assets/javascripts/wall.js.coffee
index 2b354c32..22a89c35 100644
--- a/app/assets/javascripts/wall.js.coffee
+++ b/app/assets/javascripts/wall.js.coffee
@@ -70,7 +70,7 @@
renderNote: (note) ->
author = '' + note.author.name + ''
- body = '' + note.body + ''
+ body = '' + linkify(sanitize(note.body)) + ''
file = ''
time = '' + note.created_at + ''
@@ -80,4 +80,3 @@
html = '' + author + body + file + time + ''
$('ul.notes').append(html)
-