diff --git a/scm-ui/src/repos/components/ChangesetAuthor.js b/scm-ui/src/repos/components/ChangesetAuthor.js
new file mode 100644
index 0000000000..d2993daed4
--- /dev/null
+++ b/scm-ui/src/repos/components/ChangesetAuthor.js
@@ -0,0 +1,27 @@
+//@flow
+
+import React from "react";
+import type { Changeset } from "@scm-manager/ui-types";
+
+type Props = {
+  changeset: Changeset
+};
+
+export default class ChangesetAuthor extends React.Component<Props> {
+  render() {
+    const { changeset } = this.props;
+    return (
+      <>
+        {changeset.author.name}{" "}
+        <a
+          className="is-hidden-mobile"
+          href={"mailto:" + changeset.author.mail}
+        >
+          &lt;
+          {changeset.author.mail}
+          &gt;
+        </a>
+      </>
+    );
+  }
+}
diff --git a/scm-ui/src/repos/components/ChangesetRow.js b/scm-ui/src/repos/components/ChangesetRow.js
index 40bcfd59ed..9ec3a7af58 100644
--- a/scm-ui/src/repos/components/ChangesetRow.js
+++ b/scm-ui/src/repos/components/ChangesetRow.js
@@ -7,6 +7,7 @@ import ChangesetAvatar from "./ChangesetAvatar";
 import ChangesetId from "./ChangesetId";
 import injectSheet from "react-jss";
 import { DateFromNow } from "@scm-manager/ui-components";
+import ChangesetAuthor from "./ChangesetAuthor";
 
 const styles = {
   pointer: {
@@ -37,19 +38,7 @@ class ChangesetRow extends React.Component<Props> {
     const { changeset, classes } = this.props;
     const changesetLink = this.createLink(changeset);
     const dateFromNow = <DateFromNow date={changeset.date} />;
-    const authorLine = (
-      <>
-        {changeset.author.name}{" "}
-        <a
-          className="is-hidden-mobile"
-          href={"mailto:" + changeset.author.mail}
-        >
-          &lt;
-          {changeset.author.mail}
-          &gt;
-        </a>
-      </>
-    );
+    const authorLine = <ChangesetAuthor changeset={changeset}/>;
     return (
       <article className={classNames("media", classes.inner)}>
         <figure className="media-left">