Search remove action now works correctly when message headers and/or bodies are loaded