diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index be42e2b7a..31f63f0c9 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -29,6 +29,10 @@
         android:id="@+id/reply"
         android:title="@string/reply_action"
     />
+    <item
+        android:id="@+id/send_again"
+        android:title="@string/send_again_action"
+    />
     <item
         android:id="@+id/mark_as_read"
         android:title="@string/mark_as_read_action"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d5008741..625555373 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,6 +46,7 @@
     <string name="okay_action">OK</string> <!--  User to confirm acceptance of dialog boxes, warnings, errors, etc. -->
     <string name="cancel_action">Cancel</string>
     <string name="send_action">Send</string>
+    <string name="send_again_action">Send Again</string>
     <string name="select_action">Select</string>
     <string name="deselect_action">Deselect</string>
     <string name="reply_action">Reply</string>
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index d62852f7e..c6b6f95c2 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1110,6 +1110,11 @@ public class MessageList
     }
 
 
+    private void onResendMessage(MessageInfoHolder message)
+    {
+        MessageCompose.actionEditDraft(this, message.message.getFolder().getAccount(), message.message);
+    }
+
     private void onOpenMessage(MessageInfoHolder message)
     {
         if (message.folder.name.equals(message.message.getFolder().getAccount().getDraftsFolderName()))
@@ -1843,6 +1848,12 @@ public class MessageList
                 onForward(holder);
                 break;
             }
+            case R.id.send_again:
+            {
+                onResendMessage(holder);
+                break;
+
+            }
             case R.id.mark_as_read:
             {
                 onToggleRead(holder);