diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb
index a2903b8..27ab643 100644
--- a/app/controllers/measurements_controller.rb
+++ b/app/controllers/measurements_controller.rb
@@ -2,7 +2,7 @@ class MeasurementsController < ApplicationController
   menu_item :body_trackers
 
   before_action :find_project_by_project_id, only: [:index, :create]
-  before_action :find_measurement, only: [:destroy, :retake]
+  before_action :find_measurement, only: [:edit, :update, :destroy, :retake]
   before_action :authorize
 
   def index
@@ -25,6 +25,19 @@ class MeasurementsController < ApplicationController
     end
   end
 
+  def edit
+    prepare_measurements
+    render :index
+  end
+
+  def update
+    if @measurement.update(measurement_params)
+      flash[:notice] = 'Updated measurement'
+    end
+    prepare_measurements
+    render :index
+  end
+
   def destroy
     # FIXME: don't destroy if there are any readout values
     if @measurement.destroy
diff --git a/app/views/measurements/_index.html.erb b/app/views/measurements/_index.html.erb
index 5021bee..5d41ef6 100644
--- a/app/views/measurements/_index.html.erb
+++ b/app/views/measurements/_index.html.erb
@@ -2,8 +2,8 @@
   <table class="list">
     <thead>
       <tr>
-        <th><%= l(:field_name) %></th>
         <th><%= l(:field_taken_at_date) %></th>
+        <th><%= l(:field_name) %></th>
         <th><%= l(:field_source) %></th>
         <th style="width:10%"><%= l(:field_action) %></th>
       </tr>
@@ -12,17 +12,45 @@
       <% @measurements.each do |m| %>
         <% next if m.new_record? %>
         <tr id="measurement-<%= m.id %>" class="measurement <%= 'hidden' if m.hidden %>">
-          <td class="name"><%= m.name %></td>
           <td class="date"><%= m.taken_at.strftime("%F %R") %></td>
+          <td class="name"><%= m.name %></td>
           <td class="source"><%= m.source.name if m.source.present? %></td>
           <td class="action">
             <%= link_to l(:button_retake), retake_measurement_path(m), {
-                  remote: true,
-                  class: "icon icon-reload"
-                } %>
+              remote: true,
+              class: "icon icon-reload"
+            } %>
+            <%= link_to l(:button_edit), edit_measurement_path(m), {
+              remote: true,
+              class: "icon icon-edit"
+            } %>
             <%= delete_link measurement_path(m), {remote: true, data: {}} %>
           </td>
         </tr>
+        <% next unless (m == @measurement) &&
+          ((action_name == "edit") ||
+           (action_name == "update" && @measurement.errors.present?)) %>
+        <tr>
+          <td class="form" colspan="4">
+            <div id="edit-measurement">
+              <%= labelled_form_for @measurement,
+                url: measurement_path(@measurement),
+                method: :patch, remote: true,
+                html: {id: 'measurement-edit-form', name: 'measurement-edit-form'} do |f| %>
+
+                <%= render partial: 'measurements/form', locals: {f: f} %>
+
+                <div class="tabular">
+                  <p>
+                    <%= submit_tag l(:button_save) %>
+                    <%= link_to l(:button_cancel), "#",
+                      onclick: '$(this).closest("tr").remove(); return false;' %>
+                  </p>
+                </div>
+              <% end %>
+            </div>
+          </td>
+        </tr>
       <% end %>
     </tbody>
   </table>
diff --git a/app/views/quantities/_index.html.erb b/app/views/quantities/_index.html.erb
index 99707a3..67f4f0e 100644
--- a/app/views/quantities/_index.html.erb
+++ b/app/views/quantities/_index.html.erb
@@ -50,18 +50,16 @@
           <td class="description"><%= q.description %></td>
           <td class="formula"><%= checked_image q.formula.present? %></td>
           <td class="action">
-            <%=
-              link_to l(:button_edit), edit_quantity_path(q), {
-                remote: true,
-                class: "icon icon-edit"
-              }
-            %>
+            <%= link_to l(:button_edit), edit_quantity_path(q), {
+              remote: true,
+              class: "icon icon-edit"
+            } %>
             <%= delete_link quantity_path(q), {remote: true, data: {}} %>
           </td>
         </tr>
         <% next unless (q == @quantity) &&
-          ((action_name == "edit") || (action_name == "update" && @quantity.errors.present?))
-        %>
+          ((action_name == "edit") ||
+           (action_name == "update" && @quantity.errors.present?)) %>
         <tr>
           <td class="form" colspan="6">
             <div id="edit-quantity">
diff --git a/config/routes.rb b/config/routes.rb
index a9f7db9..021c487 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -5,7 +5,7 @@ resources :projects, shallow: true do
   resources :body_trackers, only: [:index] do
     collection do
       post 'defaults'
-      resources :measurements, only: [:index, :create, :destroy] do
+      resources :measurements, only: [:index, :create, :edit, :update, :destroy] do
         get 'retake', on: :member
       end
       resources :ingredients, only: [:index, :create, :destroy] do
diff --git a/init.rb b/init.rb
index 1df1fef..94120c8 100644
--- a/init.rb
+++ b/init.rb
@@ -24,7 +24,7 @@ Redmine::Plugin.register :body_tracking do
     }, read: true
     permission :manage_common, {
       body_trackers: [:defaults],
-      measurements: [:create, :destroy, :retake],
+      measurements: [:create, :edit, :update, :destroy, :retake],
       ingredients: [:create, :destroy, :toggle, :import, :toggle_nutrient_column],
       sources: [:create, :destroy],
       quantities: [:create, :edit, :update, :destroy, :toggle, :move],