bug fixes compose screen
merge from trunk