1 files changed, 2 insertions, 12 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 383cb2fd5..91da81e2a 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -925,18 +925,8 @@ public class ConversationFragment extends Fragment {
 					new OnPresenceSelected() {
 
 						@Override
-						public void onPresenceSelected(boolean success,
-								String presence) {
-							if (success) {
-								message.setPresence(presence);
-								xmppService.sendMessage(message);
-								messageSent();
-							}
-						}
-
-						@Override
-						public void onSendPlainTextInstead() {
-							message.setEncryption(Message.ENCRYPTION_NONE);
+						public void onPresenceSelected() {
+							message.setPresence(conversation.getNextPresence());
 							xmppService.sendMessage(message);
 							messageSent();
 						}