Only if body is available, get it.
Merge branch 'feature/#405-archive-and-delete-rewrite' into develop