You address_template should be like that:
{address_company}
{address_title} {address_firstname} {address_lastname}
{address_street}{address_street2}
{address_post_code} {address_city} {address_state}
{address_country}
<?php echo JText::sprintf('TELEPHONE_IN_ADDRESS','{address_telephone}');?>
And if you want the second address (when filled) at the line, in the listing view replace with the code:
if($fieldname != 'address_street2'){
$html=str_replace('{'.$fieldname.'}',$this->fieldsClass->show($field,$address->$fieldname),$html);
}elseif($fieldname == 'address_street2' && !empty($fieldname)){
$html= "<br/>".str_replace('{'.$fieldname.'}',$this->fieldsClass->show($field,$address->$fieldname),$html);
}