Merge "Delete attachment if there's no corresponding message" into honeycomb