Merge "Mail: Add visibility for some methods without method visibility"