diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index c9874ca815fbd9bd4ab823d0814cb9a76db6754c..edcabac831d20ea78da776f57fe422ae5bf384ec 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -432,8 +432,8 @@ public class ConversationActivity extends XmppActivity implements OnConversation
 
 	@Override
 	public void onSaveInstanceState(Bundle savedInstanceState) {
-		Intent pendingIntent = pendingViewIntent.pop();
-		savedInstanceState.putParcelable("intent", pendingIntent == null ? pendingIntent : getIntent());
+		Intent pendingIntent = pendingViewIntent.peek();
+		savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
 		super.onSaveInstanceState(savedInstanceState);
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index d8489861efaf4eb8d6189d13bd27cf3645777d45..d0670061270abd4fe314cefb4dd163d341d26576 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1584,7 +1584,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 		super.onSaveInstanceState(outState);
 		if (conversation != null) {
 			outState.putString(STATE_CONVERSATION_UUID, conversation.getUuid());
-			final Uri uri = pendingTakePhotoUri.pop();
+			final Uri uri = pendingTakePhotoUri.peek();
 			if (uri != null) {
 				outState.putString(STATE_PHOTO_URI, uri.toString());
 			}
@@ -2361,14 +2361,17 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 		if (activityResult != null) {
 			handleActivityResult(activityResult);
 		}
+		clearPending();
 	}
 
-	public void clearPending() {
+	private void clearPending() {
 		if (postponedActivityResult.pop() != null) {
-			Log.d(Config.LOGTAG, "cleared pending intent with unhandled result left");
+			Log.e(Config.LOGTAG, "cleared pending intent with unhandled result left");
 		}
 		pendingScrollState.pop();
-		pendingTakePhotoUri.pop();
+		if (pendingTakePhotoUri.pop() != null) {
+			Log.e(Config.LOGTAG,"cleared pending photo uri");
+		}
 	}
 
 	public Conversation getConversation() {