am 30cfef2c: Merge "If replacing an attachment fails, working message left in bad state"
am 30cfef2c: Merge "If replacing an attachment fails, working message left in bad state"

* commit '30cfef2c23ab0c9f28ecdfc5da49cadd415521a4':
  If replacing an attachment fails, working message left in bad state

bmaupin/android-sms-plus