Fixed raw mail indexing