iPhone 5 iOS 7 can't send from gmail account
I've been using my iCloud account to receive push notifications from my gmail emails, my gmail emails are being forwarded to my iCloud account. I've set the outgoing server settings that it won't use the iCloud SMTP server, but it will use smtp.gmail.com so it will send using my @gmail.com address.
Setting -> Mail, Contacts, Calendar -> iCloud -> Account -> Advanced Mail -> outgoing mail server -> Turned off iCloud SMTP server and added smtp.gmail.com as other outgoing server.
Since I've updated to iOS 7 it's not sending with my @gmail.com anymore, but it's now sending with @icloud.com. On my iPad I've the same settings, but I've not updated yet to iOS 7 and on my iPad it still sends with @gmail.com.
Does anybody know if they changed something in iOS7 and if there is a workaround for this?
iPhone 5, iOS 7