am fc3aab36: am 0dd360c2: reconcile froyo-release into gingerbread

Merge commit 'fc3aab36626a704a45db450ad7e7d14f45f748eb'

* commit 'fc3aab36626a704a45db450ad7e7d14f45f748eb':
  Increase EmailServiceProxy timeout for validation attempts
  Block oversize attachments from being sent