diff --git a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
index b01745759..4e3caf5d4 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationViewModel.java
@@ -72,7 +72,6 @@ import static org.briarproject.bramble.util.LogUtils.now;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.observeForeverOnce;
 import static org.briarproject.briar.android.view.TextSendController.SendState.ERROR;
-import static org.briarproject.briar.android.view.TextSendController.SendState.SENDING;
 import static org.briarproject.briar.android.view.TextSendController.SendState.SENT;
 import static org.briarproject.briar.android.view.TextSendController.SendState.UNEXPECTED_TIMER;
 import static org.briarproject.briar.api.autodelete.AutoDeleteConstants.NO_AUTO_DELETE_TIMER;
@@ -328,7 +327,7 @@ public class ConversationViewModel extends DbViewModel
 	@UiThread
 	LiveData<SendState> sendMessage(@Nullable String text,
 			List<AttachmentHeader> headers, long expectedTimer) {
-		MutableLiveData<SendState> liveData = new MutableLiveData<>(SENDING);
+		MutableLiveData<SendState> liveData = new MutableLiveData<>();
 		runOnDbThread(() -> {
 			try {
 				db.transaction(false, txn -> {
@@ -345,9 +344,11 @@ public class ConversationViewModel extends DbViewModel
 							m.getAutoDeleteTimer());
 					// TODO add text to cache when available here
 					MessageId id = message.getId();
-					txn.attach(() -> attachmentCreator.onAttachmentsSent(id));
-					liveData.postValue(SENT);
-					addedHeader.postEvent(h);
+					txn.attach(() -> {
+						attachmentCreator.onAttachmentsSent(id);
+						liveData.setValue(SENT);
+						addedHeader.setEvent(h);
+					});
 				});
 			} catch (UnexpectedTimerException e) {
 				liveData.postValue(UNEXPECTED_TIMER);
@@ -365,8 +366,7 @@ public class ConversationViewModel extends DbViewModel
 		// Sending is only possible (setReady(true)) after loading all messages
 		// which happens after the contact has been loaded.
 		// privateMessageFormat is loaded together with contact
-		Contact contact =
-				requireNonNull(this.contactItem.getValue()).getContact();
+		Contact contact = requireNonNull(contactItem.getValue()).getContact();
 		GroupId groupId = messagingManager.getContactGroup(contact).getId();
 		PrivateMessageFormat format =
 				requireNonNull(privateMessageFormat.getValue());
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
index 0a1d8d899..0d6c432c7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextSendController.java
@@ -178,7 +178,7 @@ public class TextSendController implements TextInputListener {
 		return state;
 	}
 
-	public enum SendState {SENDING, SENT, ERROR, UNEXPECTED_TIMER}
+	public enum SendState {SENT, ERROR, UNEXPECTED_TIMER}
 
 	public interface SendListener extends LifecycleOwner {
 		LiveData<SendState> onSendClick(@Nullable String text,