fix issue https://github.com/tracim/tracim/issues/630

frontend_lib/src/component/Timeline/Comment.jsx

@@ -26,14 +26,21 @@ const Comment = props => {
         </div>
       </div>
       <div
-        className={classnames(`${props.customClass}__messagelist__item__createhour`, 'timeline__body__messagelist__item__createhour')}>
-        {props.createdAt}
+        className={classnames(`${props.customClass}__messagelist__item__authorandhour`, 'timeline__body__messagelist__item__authorandhour')}>
+          <div className='mr-5'>
+            {props.createdAt}
+          </div>
+          {props.author}
       </div>
       <div
         className={classnames(`${props.customClass}__messagelist__item__content`, 'timeline__body__messagelist__item__content')}
         style={props.fromMe ? styleSent : styleReceived}
-        dangerouslySetInnerHTML={{__html: props.text}}
-      />
+
+      >
+        <div className='timeline__body__messagelist__item__content__text'>
+          {props.text}
+        </div>
+      </div>
     </li>
   )
 }

frontend_lib/src/component/Timeline/Timeline.jsx

@@ -54,6 +54,7 @@ class Timeline extends React.Component {
                   return <Comment
                     customClass={props.customClass}
                     customColor={props.customColor}
+                    author={content.author.public_name}
                     avatar={content.author.avatar_url}
                     createdAt={content.created}
                     text={content.raw_content}

frontend_lib/src/component/Timeline/Timeline.styl

@@ -45,8 +45,11 @@
             width 45px
             height 45px
             border-radius 25px
-        &__createhour
-          margin-left 35px
+        &__authorandhour
+          display flex
+          align-items center
+          justify-content flex-end
+          margin-right 35px
           opacity 0.7
           font-size 14px
         &__content