Merge branch 'master' into feature/compress-images

# Conflicts:
#	app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt

app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt

@@ -109,11 +109,25 @@ class ThreadActivity : SimpleActivity() {
 
     override fun onResume() {
         super.onResume()
+
+        val smsDraft = getSmsDraft(threadId)
+        if (smsDraft != null) {
+            thread_type_message.setText(smsDraft)
+        }
         isActivityVisible = true
     }
 
     override fun onPause() {
         super.onPause()
+
+        if (thread_type_message.value != "" && attachmentUris.isEmpty()) {
+            saveSmsDraft(thread_type_message.value, threadId)
+        } else {
+            deleteSmsDraft(threadId)
+        }
+
+        bus?.post(Events.RefreshMessages())
+
         isActivityVisible = false
     }