update copyright notices

README.md

@@ -1,6 +1,6 @@
 # SimpleEmail
 
-SimpleEmail is Free Software, minimalistic and privacy friendly email app for Android.
+SimpleEmail is [Free Software][free-software], minimalistic and privacy friendly email app for Android.
 
 *This project has been forked from [FairEmail](https://github.com/M66B/open-source-email).*
 
@@ -21,7 +21,7 @@ This app starts a foreground service with a low priority status bar notification
 
 ## Features
 
-* 100% Free Software
+* 100% [Free Software][free-software]
 * Multiple accounts (inboxes)
 * Multiple identities (outboxes)
 * Unified inbox
@@ -132,3 +132,22 @@ SimpleEmail uses:
 ## License
 
 [GNU General Public License version 3](https://framagit.org/dystopia-project/simple-email/blob/master/LICENSE)
+
+   Copyright 2018, Marcel Bokhorst (M66B)
+   Copyright 2018, Distopico (dystopia project) and contributors
+   
+   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/>.
+
+
+ [free-software]: https://www.gnu.org/philosophy/free-sw.html

app/src/main/java/org/dystopia/email/ActivityBase.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.content.SharedPreferences;

app/src/main/java/org/dystopia/email/ActivityCompose.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Intent;

app/src/main/java/org/dystopia/email/ActivityMain.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Intent;

app/src/main/java/org/dystopia/email/ActivitySetup.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.BroadcastReceiver;

app/src/main/java/org/dystopia/email/ActivityView.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.app.Activity;

app/src/main/java/org/dystopia/email/AdapterAccount.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterAnswer.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterAttachment.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterFolder.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterIdentity.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterLog.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/AdapterMessage.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.Manifest;

app/src/main/java/org/dystopia/email/AdapterOperation.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/ApplicationEx.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.app.Application;

app/src/main/java/org/dystopia/email/BoundaryCallbackMessages.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/DB.java

@@ -39,7 +39,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 // https://developer.android.com/topic/libraries/architecture/room.html

app/src/main/java/org/dystopia/email/DaoAccount.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoAnswer.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoAttachment.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoFolder.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoIdentity.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoLog.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DaoOperation.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import java.util.List;

app/src/main/java/org/dystopia/email/DialogBuilderLifecycle.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/EntityAccount.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import org.json.JSONException;

app/src/main/java/org/dystopia/email/EntityAnswer.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import org.json.JSONException;

app/src/main/java/org/dystopia/email/EntityAttachment.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/EntityFolder.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import org.json.JSONException;

app/src/main/java/org/dystopia/email/EntityIdentity.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import org.json.JSONException;

app/src/main/java/org/dystopia/email/EntityLog.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/EntityMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/EntityOperation.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/FragmentAbout.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.app.usage.UsageStatsManager;

app/src/main/java/org/dystopia/email/FragmentAccount.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.Manifest;

app/src/main/java/org/dystopia/email/FragmentAccounts.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentAnswer.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/FragmentAnswers.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentCompose.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.Manifest;

app/src/main/java/org/dystopia/email/FragmentEula.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.SharedPreferences;

app/src/main/java/org/dystopia/email/FragmentEx.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.content.res.Configuration;

app/src/main/java/org/dystopia/email/FragmentFolder.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/FragmentFolders.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.SharedPreferences;

app/src/main/java/org/dystopia/email/FragmentIdentities.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentIdentity.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/FragmentLegend.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentLogs.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentMessages.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/FragmentOperations.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentOptions.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.content.SharedPreferences;

app/src/main/java/org/dystopia/email/FragmentPrivacy.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
   You should have received a copy of the GNU General Public License
   along with SimpleEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-  Copyright 2018 by Distopico <distopico@riseup.net>
+  Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.os.Bundle;

app/src/main/java/org/dystopia/email/FragmentSetup.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.Manifest;

app/src/main/java/org/dystopia/email/FragmentWebView.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/Helper.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.accounts.Account;

app/src/main/java/org/dystopia/email/HtmlHelper.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import org.jsoup.Jsoup;

app/src/main/java/org/dystopia/email/ItemDetailsLookupMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.view.MotionEvent;

app/src/main/java/org/dystopia/email/ItemDetailsMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import androidx.annotation.Nullable;

app/src/main/java/org/dystopia/email/ItemKeyProviderMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import androidx.annotation.NonNull;

app/src/main/java/org/dystopia/email/JobDaily.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.app.job.JobInfo;

app/src/main/java/org/dystopia/email/MessageHelper.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/MimeMessageEx.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.util.Log;

app/src/main/java/org/dystopia/email/Provider.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/ReceiverAutostart.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.BroadcastReceiver;

app/src/main/java/org/dystopia/email/SelectionPredicateMessage.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import androidx.annotation.NonNull;

app/src/main/java/org/dystopia/email/ServiceSynchronize.java

@@ -16,8 +16,8 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
-    Copyright 2018 by Distopico <distopico@riseup.net>
+    Copyright 2018, Marcel Bokhorst (M66B)
+    Copyright 2018, Distopico (dystopia project) <distopico@riseup.net> and contributors
 */
 
 import android.Manifest;

app/src/main/java/org/dystopia/email/SimpleTask.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/TupleAccountStats.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 public class TupleAccountStats {

app/src/main/java/org/dystopia/email/TupleFolderEx.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 public class TupleFolderEx extends EntityFolder {

app/src/main/java/org/dystopia/email/TupleIdentityEx.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 public class TupleIdentityEx extends EntityIdentity {

app/src/main/java/org/dystopia/email/TupleMessageEx.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 public class TupleMessageEx extends EntityMessage {

app/src/main/java/org/dystopia/email/ViewModelBrowse.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.content.Context;

app/src/main/java/org/dystopia/email/ViewModelMessages.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import androidx.lifecycle.ViewModel;

app/src/main/java/org/dystopia/email/Widget.java

@@ -16,7 +16,7 @@ package org.dystopia.email;
     You should have received a copy of the GNU General Public License
     along with FairEmail.  If not, see <http://www.gnu.org/licenses/>.
 
-    Copyright 2018 by Marcel Bokhorst (M66B)
+    Copyright 2018, Marcel Bokhorst (M66B)
 */
 
 import android.app.PendingIntent;

app/src/main/res/values-af/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-cs/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-de/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Dienst</string>
   <string name="channel_notification">Benachrichtigungen</string>
   <string name="channel_error">Fehler</string>

app/src/main/res/values-el/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-en/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-fa/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">سرویس</string>
   <string name="channel_notification">اعلان‌ها</string>
   <string name="channel_error">خطاها</string>

app/src/main/res/values-fi/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-he/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-hu/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Szolgáltatás</string>
   <string name="channel_notification">Értesítések</string>
   <string name="channel_error">Hibák</string>

app/src/main/res/values-iw/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-ja/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-ko/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-nb/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-no/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-ru/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-sr/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-uk/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-vi/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="channel_service">Service</string>
   <string name="channel_notification">Notifications</string>
   <string name="channel_error">Errors</string>

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
   <string name="app_name" translatable="false">SimpleEmail</string>
   <string name="app_label" translatable="false">Email</string>
-  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst</string>
+  <string name="app_copyright">Copyright &#x24B8; 2018 by M. Bokhorst\nCopyright &#x24B8; 2018 by Distopico (dystopia project) and contributors</string>
   <string name="app_eula" translatable="false">THIS SOFTWARE IS PROVIDED BY THE AUTHOR \'\'AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
 
   <string name="channel_service">Service</string>