Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
II*€?àOøþ












 
)Ô









@



þ





(

/home/alec/trunk/roundcubemail/empty.tifH
H