diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
index 541bde0..51f76b2 100644
--- a/app/controllers/answers_controller.rb
+++ b/app/controllers/answers_controller.rb
@@ -20,7 +20,7 @@
       authorize @answer
 
       if @answer.save
-        @timestamp = Time.now.iso8601
+        @timestamp = @answer.updated_at.iso8601
       end
       @lock_version = @answer.lock_version
     elsif params[:answer][:id].blank? # Someone else already added an answer while the user was working
diff --git a/app/views/answers/_status.html.erb b/app/views/answers/_status.html.erb
new file mode 100644
index 0000000..e1c8d8b
--- /dev/null
+++ b/app/views/answers/_status.html.erb
@@ -0,0 +1,9 @@
+    <!-- Partial for handling the answer status (e.g. Saving, Unsaved, Not Answered, Answered) -->
+    <span class="saving-message" style="display:none"><%= _('Saving...')%></span>
+    <span class="label label-inverse answer-unsaved" style="display:none"><%= _('Unsaved changes') %></span>
+    <br/>
+    <% if answer.updated_at.blank? %>
+        <span class="label label-warning answer-status"><%= _('Not answered yet') %></span>
+    <% else %>
+        <span class="label label-info answer-status"><%= _('Answered')%> <abbr class="timeago" data-time="<%= answer.updated_at.iso8601 %>" title="<%= answer.updated_at.iso8601 %>"><%= answer.updated_at.iso8601 %></abbr><%= _(' by')%> <%= answer.user.name %></span>
+    <% end %>
\ No newline at end of file
diff --git a/app/views/answers/update.js.erb b/app/views/answers/update.js.erb
index 8086893..ec06441 100644
--- a/app/views/answers/update.js.erb
+++ b/app/views/answers/update.js.erb
@@ -3,10 +3,6 @@
 // On success this will be "" on error it will be the 
 // conflicting answer
 
-// go back from "Saving..." message to "Save" button
-$("#saving-<%=@question.id%>").hide();
-$("#saving-<%=@question.id%>").prev().show();
-
 <% if @old_answer %>
   $("#answer_notice_<%=@question.id%>").html("<%= escape_javascript(render partial: '/phases/answer', locals: { question: @question, answer: @old_answer}) %>"); 
 <% else %>
@@ -21,20 +17,13 @@
 $("#question-form-<%= @question.id %> #answer_id").val(<%= @answer.id %>);
 
 // update the answer status
-
-var q_status = $("#<%=@question.id%>-status");
-var timestamp = "<%= @timestamp.nil? ? "": @timestamp %>";
-
-if( timestamp != "") {
-  q_status.text("");
-  q_status.append("<%= _('Answered') %> <abbr class=\"timeago\" data-time=\"<%=@timestamp%>\" title=\"<%=@timestamp%>\"><%=@timestamp%></abbr> <%= _('by') %> <%=@username%>");
-	$('abbr.timeago').timeago();
-}
-
+$("#answer-status-<%= @question.id %>")
+    .html("<%= escape_javascript(render partial: '/answers/status', locals: { question_id: @question.id, answer: @answer}) %>");
+if($.fn.init_answer_status) 
+    $.fn.init_answer_status();
 
 // update plan progress bar
 $(".progress").html("<%= escape_javascript(render :partial => '/plans/progress', locals: {nquestions: @nquestions, nanswers: @nanswers}) %>"); 
 
-
 // update the section progress message
 $("#<%=@section_id%>-status").html("(<%=@n_section_questions%> <%= _('questions') %>, <%=@n_section_answers%> <%= _('answered') %>)")
diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index abee475..9a252b7 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -117,20 +117,12 @@
         <% if !readonly %>
 				  <input type="submit" class="form-submit" value="<%= _('Save') %>" />
         <% end %>
-				<div id="saving-<%= question_id %>" class="saving-message" style="display:none;"><%= _('Saving...')%></div>
-				
-				<span id="<%= question_id %>-unsaved" class="label label-inverse answer-unsaved" style="display:none;"><%= _('Unsaved changes') %></span>
-				
       </fieldset>   <!-- f.inputs -->
-      
+      <div id="<%= "answer-status-#{question_id}" %>">
+        <%= render(partial: 'answers/status', locals: { question_id: question_id, answer: answer }) %>
+      </div>
     <% end %>
   </div>   <!-- question-form -->
-
-  <% if answer.nil? || !answer.text.present? %>
-    <span id="<%= question_id %>-status" class="label label-warning answer-status"><%= _('Not answered yet') %></span>
-  <% else %>
-    <span id="<%= question_id %>-status" class="label label-info answer-status"><%= _('Answered')%> <abbr class="timeago" data-time="<%= answer.updated_at.iso8601 %>" title="<%= answer.updated_at.iso8601 %>"><%= answer.updated_at.iso8601 %></abbr><%= _(' by')%> <%= answer.user.name %></span>
-  <% end %>
 </div>   <!-- question-div -->
       
 <!-- Question right column -->
diff --git a/app/views/phases/edit.html.erb b/app/views/phases/edit.html.erb
index 8310dce..9c73d91 100644
--- a/app/views/phases/edit.html.erb
+++ b/app/views/phases/edit.html.erb
@@ -1,6 +1,6 @@
 <%- model_class = Plan -%>
 <% javascript "plans.js" %>
-
+<% javascript "answers/status.js" %>
 <!--
   editing plan details is handled through plan#show
   so if we come this way then we are editing a phase
diff --git a/config/application.rb b/config/application.rb
index 8b20d7d..5693427 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -82,6 +82,7 @@
     config.assets.precompile += %w(plans/new_plan.js)
     config.assets.precompile += %w(contacts/new_contact.js)
     config.assets.precompile += %w(shared/register_form.js)
+    config.assets.precompile += %w(answers/status.js)
     
     config.autoload_paths += %W(#{config.root}/lib)
     config.action_controller.include_all_helpers = true
diff --git a/lib/assets/javascripts/answers/status.js b/lib/assets/javascripts/answers/status.js
new file mode 100644
index 0000000..3358bd9
--- /dev/null
+++ b/lib/assets/javascripts/answers/status.js
@@ -0,0 +1,17 @@
+//= require jquery.timeago.js
+
+$(document).ready(function(){
+    $("form.answer").submit(function(){
+        var saving = $(this).find('.saving-message');
+        saving.show();
+    });
+    $("form.answer fieldset input, form.answer fieldset select").change(function(){
+        var unsaved = $(this).closest('form.answer').find('.answer-unsaved');
+        unsaved.show();
+    });
+    // TODO An adequate listener for textarea (e.g. tinymce) that triggers unsaved.show(). Temporary workaround defined at $.fn.toggle_dirty (plans.js)
+    $.fn.init_answer_status = function() {
+        $('abbr.timeago').timeago();
+    }
+    $.fn.init_answer_status();
+});
\ No newline at end of file
diff --git a/lib/assets/javascripts/plans.js b/lib/assets/javascripts/plans.js
index 1a690e4..86acb77 100644
--- a/lib/assets/javascripts/plans.js
+++ b/lib/assets/javascripts/plans.js
@@ -1,6 +1,4 @@
-//= require jquery.timeago.js
-//= require tinymce
-//= require tinymce-jquery
+
 
 var dirty = {};
 
@@ -112,20 +110,6 @@
 		}
 	};
 
-	// Make timestamps readable
-	$('abbr.timeago').timeago();
-
-	// Update status messages on form submission
-	$("form.answer").submit(function(){
-		var submit_button = $(this).find('input[type="submit"]');
-		var saving_message = $(this).find('.saving-message');
-		submit_button.hide();
-		q_id = $(this).find(".question_id").val();
-		saving_message.show();
-		s_status = $(this).closest(".accordion-group").find(".section-status:first");
-		s_status.toggle_dirty(q_id, false);
-	});
-
 	//accordion guidance
 	$('.accordion-guidance-link').on('click', function (e) {
 		e.stopPropagation();
@@ -148,9 +132,7 @@
 
 
 	// Handle section actions on accordion expansion/collapse
-	$('.section-collapse').on('show', function() {
-	    $('abbr.timeago').timeago();
-   }).on('hide', function(){
+	$('.section-collapse').on('hide', function(){
   	 var section = $(this);
      var section_id = section.attr("id").split('-')[1];
      if ($.fn.is_dirty(section_id)) {
@@ -178,10 +160,6 @@
         $("#collapse-" + section_id).find("input[type='submit']").click();
         $('#section-' + section_id + '-collapse-alert').modal("hide");
     });
-
-    $("select, :radio, :checkbox, input").change(function() {
-        $(this).closest(".accordion-group").find(".section-status:first").toggle_dirty($(this).closest("form.answer").find(".question_id").val(), true);
-    });
   
     // COMMENTS Javascript
 
@@ -314,7 +292,7 @@
         q_status.addClass("label-success");
         // Set timestamp text and data
         t.text(timestamp.toUTCString());
-        t.attr('title', timestamp.toISOString()).data("timeago",null).timeago();
+        //t.attr('title', timestamp.toISOString()).data("timeago",null).timeago();
         t.attr('data-time', timestamp.toISOString());
         return true;
 	}
@@ -337,7 +315,7 @@
 			q_status.addClass("label-success");
 			// Set timestamp text and data
 			t.text(timestamp.toUTCString());
-			t.attr('title', timestamp.toISOString()).data("timeago",null).timeago();
+			//t.attr('title', timestamp.toISOString()).data("timeago",null).timeago();
 			t.attr('data-time', timestamp.toISOString());
 			return true;
 		}
@@ -382,7 +360,7 @@
 	dirty[section_id][question_id] = is_dirty;
 	if (is_dirty) {
 		$("#"+question_id+"-unsaved").show();
-        
+        $("#answer-status-"+question_id).find('.answer-unsaved').show();    // Temporary workaround ONLY triggered when textarea format type changes
 	}
 	else {
 		$("#"+question_id+"-unsaved").hide();
@@ -395,5 +373,4 @@
 // this is the function used to hanndle the interface between tinymce and the Dirty stuff
 $.fn.check_textarea = function(editor) {
      $("#"+editor.id).closest(".accordion-group").find(".section-status:first").toggle_dirty(editor.id.split('-')[2], editor.isDirty());
-       
 };