diff --git a/Tusker/Screens/Compose/ComposeViewController.swift b/Tusker/Screens/Compose/ComposeViewController.swift
index 2013bde9b8..8700ab983e 100644
--- a/Tusker/Screens/Compose/ComposeViewController.swift
+++ b/Tusker/Screens/Compose/ComposeViewController.swift
@@ -431,6 +431,9 @@ class ComposeViewController: UIViewController {
         guard let text = statusTextView.text,
             !text.isEmpty else { return }
         
+        // save a draft before posting the status, so if a crash occurs during posting, the status won't be lost
+        saveDraft()
+
         // disable post button while sending post request
         postBarButtonItem.isEnabled = false