diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 147a7a5f9..fe3f79cb9 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -399,6 +399,7 @@ public class ConversationFragment extends Fragment {
 			return true;
 		case R.id.download_image:
 			downloadImage(selectedMessage);
+			return true;
 		default:
 			return super.onContextItemSelected(item);
 		}
diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
index 5b5b0608f..77f8b68a6 100644
--- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -123,6 +123,7 @@ public class ManageAccountActivity extends XmppActivity {
 			return true;
 		case R.id.mgmt_account_announce_pgp:
 			publishOpenPGPPublicKey(selectedAccount);
+			return true;
 		default:
 			return super.onContextItemSelected(item);
 		}