diff --git a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
index c70ce4ca56..418bbd6bdf 100644
--- a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
+++ b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx
@@ -53,11 +53,23 @@ class ChangesetAuthor extends React.Component<Props> {
     );
   }
 
+  checkIfCoAuthorsExists() {
+    console.log(this.props.changeset.trailerPersons.filter(p => p.trailerType === "Co-authored-by").length > 0);
+    return this.props.changeset.trailerPersons.filter(p => p.trailerType === "Co-authored-by").length > 0;
+  }
+
+  renderCoAuthors() {
+    const { t } = this.props;
+
+    return <>{t("changeset.author.prefix")}</>;
+  }
+
   withExtensionPoint(child: any) {
     const { t } = this.props;
     return (
       <>
         {t("changeset.author.prefix")} {child}
+        {this.checkIfCoAuthorsExists() ? this.renderCoAuthors() : null}
         <ExtensionPoint
           name="changesets.author.suffix"
           props={{
diff --git a/scm-ui/ui-types/src/Changesets.ts b/scm-ui/ui-types/src/Changesets.ts
index 7eeb9eb27e..53c4aa53c1 100644
--- a/scm-ui/ui-types/src/Changesets.ts
+++ b/scm-ui/ui-types/src/Changesets.ts
@@ -34,6 +34,7 @@ export type Changeset = Collection & {
     mail?: string;
   };
   description: string;
+  trailerPersons: TrailerPerson[];
   _links: Links;
   _embedded: {
     tags?: Tag[];
@@ -42,6 +43,12 @@ export type Changeset = Collection & {
   };
 };
 
+export type TrailerPerson = {
+  name: string;
+  mail: string;
+  trailerType: string;
+};
+
 export type ParentChangeset = {
   id: string;
   _links: Links;