Fix bug that prevented avatars to be shown in groupchats. Bug was due to a...

Fix bug that prevented avatars to be shown in groupchats. Bug was due to a wrong re-use of a local variable (local variabes are evil :-).

Additionally: Remove some appreviations and unneeded local variables.