diff --git a/tracks/app/views/notes/_notes.rhtml b/tracks/app/views/notes/_notes.rhtml
index c99812fc..9d71eec5 100644
--- a/tracks/app/views/notes/_notes.rhtml
+++ b/tracks/app/views/notes/_notes.rhtml
@@ -1,39 +1,39 @@
 <% note = notes -%>
 <div id="<%= dom_id(note, 'container') %>">
-     <h2><%= link_to("Note #{note.id}", note_path(note), :title => "Show note #{note.id}" ) %></h2>
+  <h2><%= link_to("Note #{note.id}", note_path(note), :title => "Show note #{note.id}" ) %></h2>
   <div id="<%= dom_id(note) %>">
-       <%= sanitize(textilize(note.body)) %>
-   
-       <div class="note_footer">
-    <%= link_to_remote( 
+    <%= sanitize(textilize(note.body.gsub(/((https?:\/\/[^ ]*))/, '<a href="\2">\1</a>'))) %>
+       
+    <div class="note_footer">
+      <%= link_to_remote( 
         image_tag("blank.png", 
-            :title =>"Delete this note", 
-            :class=>"delete_item",
-            :id => "delete_note_"+note.id.to_s), 
+          :title =>"Delete this note", 
+          :class=>"delete_item",
+          :id => "delete_note_"+note.id.to_s), 
         :update => dom_id(note),
         :loading => visual_effect(:fade, dom_id(note, 'container')),
         :complete => "Element.remove('#{dom_id(note, 'container')}');",
         :url => note_path(note),
         :method => :delete,
         :confirm => "Are you sure that you want to delete the note \'#{note.id.to_s}\'?" ) + "&nbsp;" -%>
-<%= link_to_function(image_tag( "blank.png", :title => "Edit item", :class=>"edit_item"),
-                     "Element.toggle('#{dom_id(note)}'); Element.toggle('#{dom_id(note, 'edit')}'); Effect.Appear('#{dom_id(note, 'edit')}'); Form.focusFirstElement('#{dom_id(note, 'edit_form')}');" ) + " | " %>
-    <%= link_to("In: " + note.project.name, project_path(note.project), :class=>"footer_link" ) %>&nbsp;|&nbsp;
-    Created: <%= format_date(note.created_at) %>
-    <% if note.updated_at? -%>
-      &nbsp;|&nbsp;Modified: <%= format_date(note.updated_at) %>
+      <%= link_to_function(image_tag( "blank.png", :title => "Edit item", :class=>"edit_item"),
+        "Element.toggle('#{dom_id(note)}'); Element.toggle('#{dom_id(note, 'edit')}'); Effect.Appear('#{dom_id(note, 'edit')}'); Form.focusFirstElement('#{dom_id(note, 'edit_form')}');" ) + " | " %>
+      <%= link_to("In: " + note.project.name, project_path(note.project), :class=>"footer_link" ) %>&nbsp;|&nbsp;
+      Created: <%= format_date(note.created_at) %>
+      <% if note.updated_at? -%>
+        &nbsp;|&nbsp;Modified: <%= format_date(note.updated_at) %>
+      <% end -%>
+    </div>
+  </div>
+  
+  <div id="<%= dom_id(note, 'edit') %>" class="edit-form" style="display:none;">
+    <% form_remote_tag  :url => note_path(note),
+      :method => :put,
+      :html => { :id => dom_id(note, 'edit_form'), :class => "inline-form" },
+      :update => dom_id(note, 'container'),
+      :complete => visual_effect(:appear, dom_id(note, 'container')) do -%>
+      <%= render :partial => "notes/note_edit_form", :object => note %>
     <% end -%>
   </div>
 </div>
-
-<div id="<%= dom_id(note, 'edit') %>" class="edit-form" style="display:none;">
-     <% form_remote_tag  :url => note_path(note),
-                         :method => :put,
-                    :html => { :id => dom_id(note, 'edit_form'), :class => "inline-form" },
-                    :update => dom_id(note, 'container'),
-                    :complete => visual_effect(:appear, dom_id(note, 'container')) do -%>
-         <%= render :partial => "notes/note_edit_form", :object => note %>
-     <% end -%>
-     </div>
-</div>
 <% note = nil -%>
diff --git a/tracks/app/views/todos/_toggle_notes.rhtml b/tracks/app/views/todos/_toggle_notes.rhtml
index 524871a7..1993e7ae 100644
--- a/tracks/app/views/todos/_toggle_notes.rhtml
+++ b/tracks/app/views/todos/_toggle_notes.rhtml
@@ -1,8 +1,7 @@
 <%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_notes', :title => 'Show notes'}) %>
 <% apply_behavior 'a.show_notes:click', :prevent_default => true do |page, element|
-     element.next('.todo_notes').toggle
-   end
--%>
-      <div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
-        <%= markdown( item.notes ) %>
-      </div>
\ No newline at end of file
+  element.next('.todo_notes').toggle
+end -%>
+<div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
+  <%= markdown( item.notes.gsub(/((https?:\/\/[^ ]*))/, '<a href="\2">\1</a>') ) %>
+</div>
\ No newline at end of file