- /* if attachments have been deleted we delete the message and reupload
- * it. This works better if we're expunging, of course. */
- if (ctx->hdrs[n]->attach_del)
+ /* if the message has been rethreaded or attachments have been deleted
+ * we delete the message and reupload it.
+ * This works better if we're expunging, of course. */
+ if (ctx->hdrs[n]->refs_changed || ctx->hdrs[n]->irt_changed ||
+ ctx->hdrs[n]->attach_del)