diff --git a/lib/email_cook.rb b/lib/email_cook.rb
index 33693190cbb..d30f4b9f665 100644
--- a/lib/email_cook.rb
+++ b/lib/email_cook.rb
@@ -1,4 +1,7 @@
 # A very simple formatter for imported emails
+
+require 'uri'
+
 class EmailCook
 
   def initialize(raw)
@@ -30,6 +33,10 @@ class EmailCook
 
     result.gsub!(/(<br>){3,10}/, '<br><br>')
 
+    URI.extract(result).each do |m|
+      result.gsub!(m, "<a href='#{m}'>#{m}</a>")
+    end
+
     result
   end