bp_the_thread_message_sender_link();
            ?>
" title="<?php 
            bp_the_thread_message_sender_name();
            ?>
"><?php 
            bp_the_thread_message_sender_name();
            ?>
</a></strong>

          <?php 
        } else {
            ?>

            <strong><?php 
            bp_the_thread_message_sender_name();
            ?>
</strong>

          <?php 
        }
        ?>

          <span class="activity"><?php 
        bp_the_thread_message_time_since();
        ?>
</span>

          <?php 
        if (bp_is_active('messages', 'star')) {
            ?>

				<?php printf( __('Sent between %s and %s', 'buddypress'), bp_get_the_thread_recipients(), '<a href="' . bp_get_loggedin_user_link() . '" title="' . bp_get_loggedin_user_fullname() . '">' . bp_get_loggedin_user_fullname() . '</a>' ) ?>
			</span>
		</p>

		<?php do_action( 'bp_before_message_thread_list' ) ?>

		<?php while ( bp_thread_messages() ) : bp_thread_the_message(); ?>

			<div class="message-box">

				<div class="message-metadata">

					<?php do_action( 'bp_before_message_meta' ) ?>

					<?php bp_the_thread_message_sender_avatar( 'type=thumb&width=30&height=30' ) ?>
					<strong><a href="<?php bp_the_thread_message_sender_link() ?>" title="<?php bp_the_thread_message_sender_name() ?>"><?php bp_the_thread_message_sender_name() ?></a> <span class="activity"><?php bp_the_thread_message_time_since() ?></span></strong>

					<?php do_action( 'bp_after_message_meta' ) ?>

				</div><!-- .message-metadata -->

				<?php do_action( 'bp_before_message_content' ) ?>

				<div class="message-content">

					<?php bp_the_thread_message_content() ?>

				</div><!-- .message-content -->

				<?php do_action( 'bp_after_message_content' ) ?>