             marginBottom = "20px" # the default value actually..
         else
             marginBottom = "5px"
+
+        if not @props.is_prev_sender and @sender_is_viewer()
+            marginTop = "17px"
+
         <Col key={1} xs={8}>
             {@show_user_name() if not @props.is_prev_sender and not @sender_is_viewer()}
-            <Panel style={wordWrap:"break-word", marginBottom: marginBottom}>
+            <Panel style={wordWrap:"break-word", marginBottom: marginBottom, marginTop: marginTop}>
                 <ListGroup fill>
-                    <ListGroupItem style={background:color; fontSize: font_size}>
+                    <ListGroupItem style={background:color, fontSize: font_size}>
                         <Markdown value={value}
                                   project_id={@props.project_id}
                                   file_path={@props.file_path} />
                     </ListGroupItem>
-                    {@get_timeago()}
+                    {@get_timeago() if @props.show_avatar}
                 </ListGroup>
             </Panel>
         </Col>
 
     blank_column:  ->
         <Col key={2} xs={3}></Col>
-
-    #delete_message: ->
-    #    @props.redux.getActions(@props.name).set_input("test")
 
     render: ->
         cols = [@avatar_column(), @content_column(), @blank_column()]

        @props.account_id == @props.message.get('sender_id')

    get_timeago: ->
        if @sender_is_viewer()
            pull = "pull-right small"
        else
            pull = "pull-left small"
        if @props.show_avatar
            <div className={pull} style={color:'#888', marginTop:'2px'}>
                <TimeAgo date={new Date(@props.message.get('date'))} />
            </div>

    show_user_name: ->
        <div className={"small"} style={color:'#888', marginBottom:'2px'}>

        marginTop    : "5px"

    scroll_to_bottom: ->
        if @refs.log_container?
            node = ReactDOM.findDOMNode(@refs.log_container)
            node.scrollTop = node.scrollHeight
            @props.redux.getActions(@props.name).save_position(node.scrollTop)
            @_scrolled = false

    scroll_to_position: ->
        if @refs.log_container?
            @_scrolled = true
            node = ReactDOM.findDOMNode(@refs.log_container)
            node.scrollTop = @props.position

    on_scroll: (e) ->
        @_scrolled = true
        node = ReactDOM.findDOMNode(@refs.log_container)
        @props.redux.getActions(@props.name).save_position(node.scrollTop)
