1.fixed bugs

Conflicts:
	source/src/com/v2tech/view/conversation/MessageAuthenticationActivity.java