Issue 570

Fixed problems with button enablement after refresh
Merge pull request #585 from blackberry/next-570

Issue 570