***************
*** 340,346 ****
  {
  	QString str;
  
- #ifdef AVATARS
  	str += "<table cellspacing=\"0\"><tr>";
  	if (option.avatarsEnabled) {
  		QString client;
--- 340,345 ----
  {
  	QString str;
  
  	str += "<table cellspacing=\"0\"><tr>";
  	if (option.avatarsEnabled) {
  		QString client;
***************
*** 361,367 ****
  	}
  
  	str += "<td>";
- #endif
  
  	QString nick = jidnick(jid().full(), name());
  	str += QString("<nobr>%1</nobr>").arg(expandEntities(nick));
--- 360,365 ----
  	}
  
  	str += "<td>";
  
  	QString nick = jidnick(jid().full(), name());
  	str += QString("<nobr>%1</nobr>").arg(expandEntities(nick));
***************
*** 498,507 ****
  		}
  	}
  
- #ifdef AVATARS
  	str += "</td>";
  	str += "</tr></table>";
- #endif
  
  	return str;
  }
--- 496,503 ----
  		}
  	}
  
  	str += "</td>";
  	str += "</tr></table>";
  
  	return str;
  }