diff --git a/README.md b/README.md
new file mode 100644
index 000000000..f107aeca2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,51 @@
+# Nextcloud Talk for Android
+
+**Video & audio calls through Nextcloud on Android**
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6e151be57a3d4f69a7cf1bc047e75daa)](https://www.codacy.com/app/mario_6/talk-android?utm_source=github.com&utm_medium=referral&utm_content=nextcloud/talk-android&utm_campaign=Badge_Grade) [![irc](https://img.shields.io/badge/IRC-%23nextcloud--mobile%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-mobile)
+
+## Why is this so awesome?
+
+If you have suggestions or problems, please [open an issue](https://github.com/nextcloud/talk-android/issues) or contribute directly :)
+
+## Contribution Guidelines
+
+Please read the [Code of Conduct](https://nextcloud.com/community/code-of-conduct/). This document offers some guidance to ensure Nextcloud participants can cooperate effectively in a positive and inspiring atmosphere, and to explain how together we can strengthen and support each other.
+
+For more information please review the [guidelines for contributing](https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md) to this repository.
+
+### Apply a license
+
+All contributions to this repository are considered to be licensed under
+the GNU GPLv3 or any later version.
+
+Contributors to the Nextcloud Talk app retain their copyright. Therefore we recommend
+to add following line to the header of a file, if you changed it substantially:
+
+```
+@copyright Copyright (c) <year> <your name> (<your email address>)
+```
+
+For further information on how to add or update the license header correctly please have a look at [our licensing HowTo][applyalicense].
+
+### Sign your work
+
+We use the Developer Certificate of Origin (DCO) as a additional safeguard
+for the Nextcloud project. This is a well established and widely used
+mechanism to assure contributors have confirmed their right to license
+their contribution under the project's license.
+Please read [developer-certificate-of-origin][dcofile].
+If you can certify it, then just add a line to every git commit message:
+
+````
+  Signed-off-by: Random J Developer <random@developer.example.org>
+````
+
+Use your real name (sorry, no pseudonyms or anonymous contributions).
+If you set your `user.name` and `user.email` git configs, you can sign your
+commit automatically with `git commit -s`. You can also use git [aliases](https://git-scm.com/book/tr/v2/Git-Basics-Git-Aliases)
+like `git config --global alias.ci 'commit -s'`. Now you can commit with
+`git ci` and the commit will be signed.
+
+[dcofile]: https://github.com/nextcloud/talk-android/blob/master/contribute/developer-certificate-of-origin
+[applyalicense]: https://github.com/nextcloud/talk-android/blob/master/contribute/HowToApplyALicense.md
diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java
index cf2f6b946..fb8282062 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
index 0ea55c970..faa24ca02 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/RoomItem.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
index 17cba3b5f..882b178d0 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApi.java b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
index ee2437999..e80187890 100644
--- a/app/src/main/java/com/nextcloud/talk/api/NcApi.java
+++ b/app/src/main/java/com/nextcloud/talk/api/NcApi.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java b/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
index cc17ae81c..7637ce4ec 100644
--- a/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
+++ b/app/src/main/java/com/nextcloud/talk/api/helpers/api/ApiHelper.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java b/app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java
index 0d0a82493..7a65b3d3d 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/RetrofitBucket.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/User.java b/app/src/main/java/com/nextcloud/talk/api/models/User.java
index 16a91942f..409651114 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/User.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/User.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java b/app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java
index 6f0cce1e5..a45840d37 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/call/Call.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java
index c44e8ea69..75433131d 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java
index 806de4766..6a49dab78 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/call/CallOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java b/app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java
index fff35959f..413d90a5c 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/converters/EnumRoomTypeConverter.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java
index f8c23509d..2626dc7d6 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericMeta.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java
index ec5be04fd..a26dcca32 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java
index a860c0822..c7282a3b6 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/GenericOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java
index 98a583c08..e2340271f 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/generic/Status.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java
index 081d99599..6082c4b50 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java
index c341c176e..6b04df37d 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/AddParticipantOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java
index 3119561ec..244807fa0 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/Participant.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java
index 88feeb2da..4bf229a74 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java
index c0e612991..65e453cb9 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/participants/ParticipantsOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java
index ac42dc9d0..d4067a6d1 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/Room.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java
index c9ec7a90e..b9c365df0 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java
index 31dcaffa2..9aa741287 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java
index 49ba72edf..274363110 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java
index 39de69ce9..6a3a04105 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/rooms/RoomsOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java
index 39ab1d653..0f6e228c2 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ExactSharees.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java
index 492443ec4..31d617317 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Sharee.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java
index b76c67673..b599d50fb 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java
index b9580f9f0..dfc761c1b 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/ShareesOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java
index 94a3928e0..ed55af538 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/SharesData.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java
index 566380401..5da497378 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/sharees/Value.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java
index 13f256df7..110c63a7a 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileData.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java
index 86595dd98..0de5d1ec8 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOCS.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java
index d6ef5d3b3..9044b0140 100644
--- a/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java
+++ b/app/src/main/java/com/nextcloud/talk/api/models/json/userprofile/UserProfileOverall.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
index 7d3f03878..b6b702879 100644
--- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
+++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
index 85c01ba74..d4aba1be1 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java b/app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java
index f2a1af4f3..6b3bd5e11 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/BottomNavigationController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
index fde06c5cd..072cef066 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallsListController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
index 601344e25..8ce1a5c38 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
index 9d2be27f2..87a3b6791 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
index b69bb742f..318f5f3e8 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
index 1c7c640b6..dfe6380b4 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/WebViewLoginController.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java
index 86bda87c0..bf4c22964 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/BusModule.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java
index bfa115ba0..3d83a76ca 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/ContextModule.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
index e859bfe60..83279c31c 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/DatabaseModule.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
index 2a1dcd8c8..c810b8bb1 100644
--- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
+++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/models/LoginData.java b/app/src/main/java/com/nextcloud/talk/models/LoginData.java
index c9b90b9ac..01b1da931 100644
--- a/app/src/main/java/com/nextcloud/talk/models/LoginData.java
+++ b/app/src/main/java/com/nextcloud/talk/models/LoginData.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java b/app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java
index ac2a7d993..b77cfcc5a 100644
--- a/app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java
+++ b/app/src/main/java/com/nextcloud/talk/persistence/entities/Cache.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/persistence/entities/User.java b/app/src/main/java/com/nextcloud/talk/persistence/entities/User.java
index 51b92e786..6a3967d1f 100644
--- a/app/src/main/java/com/nextcloud/talk/persistence/entities/User.java
+++ b/app/src/main/java/com/nextcloud/talk/persistence/entities/User.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java b/app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java
index 5d9c984f8..33921e887 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/BundleKeys.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java b/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java
index 2db9b1a8d..849f41ffd 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/CachingGlideModule.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java
index 08ccfeed4..2223ae9c3 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/ColorUtils.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java b/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java
index efb6bcd07..ca365d687 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheModule.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java
index be22b6a45..9a99a095c 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/database/cache/CacheUtils.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java
index db450c3ba..00d90fd4c 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserModule.java
@@ -2,7 +2,7 @@
  * Nextcloud Talk application
  *
  * @author Mario Danic
- * Copyright (C) 2017 Mario Danic
+ * Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java
index 8e9b00226..a485c798a 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/utils/database/user/UserUtils.java
@@ -3,7 +3,7 @@
  *   Nextcloud Talk application
  *
  *   @author Mario Danic
- *   Copyright (C) 2017 Mario Danic
+ *   Copyright (C) 2017 Mario Danic (mario@lovelyhq.com)
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
diff --git a/contribute/HowToApplyALicense.md b/contribute/HowToApplyALicense.md
new file mode 100644
index 000000000..e7685fcda
--- /dev/null
+++ b/contribute/HowToApplyALicense.md
@@ -0,0 +1,41 @@
+# How to apply a license
+
+This application is licenced under the GNU GPLv3 or any later version.
+
+Nextcloud doesn't require a CLA (Contributor License Agreement).
+The copyright belongs to all the individual contributors.
+
+If you modify an existing file, please keep the existing license header as
+it is and just add your copyright notice:
+
+````
+@copyright Copyright (c) <year> <your name> (<your email address>)
+````
+
+If you create a new file please use this license header:
+
+````
+/*
+ * Nextcloud Talk application
+ *
+ * @author <your name>
+ * Copyright (C) <year> <your name> (<your email address>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */````
+
+Additionally we require a Developer Certificate of Origin (DCO), look
+at [CONTRIBUTING.md][contributing] to learn more how to sign your commits.
+
+[contributing]: https://github.com/nextcloud/talk-android/blob/master/CONTRIBUTING.md#sign-your-work
diff --git a/contribute/developer-certificate-of-origin b/contribute/developer-certificate-of-origin
new file mode 100644
index 000000000..a6bbb9846
--- /dev/null
+++ b/contribute/developer-certificate-of-origin
@@ -0,0 +1,35 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.