Fix handling of OTR switch UI

Conflicts:

	src/info/guardianproject/otr/app/im/app/ChatView.java