From e66f5be7d82c7a7618fe327fe958ec57a25ea598 Mon Sep 17 00:00:00 2001
From: Dominik Voigt <dominik.ingo.voigt@gmail.com>
Date: Thu, 14 Jan 2021 22:25:34 +0100
Subject: [PATCH] Add date fields (#7334)

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
---
 CHANGELOG.md                                  |   3 +
 .../org/jabref/cli/ArgumentProcessor.java     |   4 +-
 src/main/java/org/jabref/gui/JabRefGUI.java   |   2 +-
 .../gui/StartLiteratureReviewAction.java      |   2 +-
 .../jabref/gui/UpdateTimestampListener.java   |   5 +-
 .../org/jabref/gui/collab/ChangeScanner.java  |   2 +-
 .../gui/externalfiles/ImportHandler.java      |   2 +-
 .../org/jabref/gui/importer/ImportAction.java |   2 +-
 .../importer/actions/OpenDatabaseAction.java  |   2 +-
 .../jabref/gui/preferences/GeneralTab.fxml    |  29 +-
 .../gui/preferences/GeneralTabView.java       |  26 +-
 .../gui/preferences/GeneralTabViewModel.java  |  82 +-----
 .../texparser/ParseLatexDialogViewModel.java  |   2 +-
 .../org/jabref/logic/crawler/Crawler.java     |   5 +-
 .../jabref/logic/crawler/StudyRepository.java |  10 +-
 .../ExternalFilesContentImporter.java         |   7 +-
 .../logic/importer/ImportFormatReader.java    |   8 +-
 .../jabref/logic/importer/OpenDatabase.java   |  17 +-
 .../preferences/TimestampPreferences.java     |  47 ++--
 .../texparser/TexBibEntriesResolver.java      |   7 +-
 .../org/jabref/logic/util/UpdateField.java    |  36 +--
 .../TimeStampToDateAddAndModify.java          |  83 ++++++
 .../java/org/jabref/model/entry/Date.java     |   4 +-
 .../model/entry/field/StandardField.java      |   5 +-
 .../jabref/preferences/JabRefPreferences.java |  28 +-
 src/main/resources/l10n/JabRef_en.properties  |   9 +-
 .../gui/UpdateTimestampListenerTest.java      |  21 +-
 .../org/jabref/logic/crawler/CrawlerTest.java |   4 +
 .../LibraryEntryToFetcherConverterTest.java   |   5 +-
 .../logic/crawler/StudyRepositoryTest.java    |  12 +-
 .../ImportFormatReaderIntegrationTest.java    |   6 +-
 .../ImportFormatReaderTestParameterless.java  |   6 +-
 .../logic/importer/OpenDatabaseTest.java      |  20 +-
 .../logic/texparser/LatexParserTest.java      |  12 +-
 .../texparser/TexBibEntriesResolverTest.java  |  16 +-
 .../TimeStampToDateAddAndModifyTest.java      | 255 ++++++++++++++++++
 36 files changed, 529 insertions(+), 257 deletions(-)
 create mode 100644 src/main/java/org/jabref/migrations/TimeStampToDateAddAndModify.java
 create mode 100644 src/test/java/org/jabref/migrations/TimeStampToDateAddAndModifyTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2461ebd1e28..eb1b8112630 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,9 +15,12 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added the extension support and the external application support (For Texshow, Texmaker and LyX) to the flatpak [#7248](https://github.com/JabRef/jabref/pull/7248)
 - We added some symbols and keybindings to the context menu in the entry editor. [#7268](https://github.com/JabRef/jabref/pull/7268)
 - We added keybindings for setting and clearing the read status. [#7264](https://github.com/JabRef/jabref/issues/7264)
+- We added two new fields to track the creation and most recent modification date and time for each entry. [koppor#130](https://github.com/koppor/jabref/issues/130)
 
 ### Changed
 
+- The content of the field `timestamp` is migrated to `creationdate`. In case one configured "udpate timestampe", it is migrated to `modificationdate`. [koppor#130](https://github.com/koppor/jabref/issues/130)
+
 ### Fixed
 
 - We fixed an issue where the "Normalize page numbers" formatter did not replace en-dashes or em-dashes with a hyphen-minus sign. [#7239](https://github.com/JabRef/jabref/issues/7239)
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index e52c15bf966..cddb291b07f 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -144,7 +144,7 @@ private static Optional<ParserResult> importFile(Path file, String importFormat)
                 // * means "guess the format":
                 System.out.println(Localization.lang("Importing in unknown format") + ": " + file);
 
-                ImportFormatReader.UnknownFormatImport importResult = Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, new DummyFileUpdateMonitor());
+                ImportFormatReader.UnknownFormatImport importResult = Globals.IMPORT_FORMAT_READER.importUnknownFormat(file, Globals.prefs.getTimestampPreferences(), new DummyFileUpdateMonitor());
 
                 System.out.println(Localization.lang("Format used") + ": " + importResult.format);
                 return Optional.of(importResult.parserResult);
@@ -321,7 +321,7 @@ private List<ParserResult> importAndOpenFiles() {
                 boolean bibExtension = aLeftOver.toLowerCase(Locale.ENGLISH).endsWith("bib");
                 ParserResult pr = new ParserResult();
                 if (bibExtension) {
-                    pr = OpenDatabase.loadDatabase(aLeftOver, Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                    pr = OpenDatabase.loadDatabase(aLeftOver, Globals.prefs.getImportFormatPreferences(), Globals.prefs.getTimestampPreferences(), Globals.getFileUpdateMonitor());
                 }
 
                 if (!bibExtension || (pr.isEmpty())) {
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index ed62b405ad5..bf6dce8c2fe 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -275,7 +275,7 @@ private void openLastEditedDatabases() {
             }
 
             ParserResult parsedDatabase = OpenDatabase.loadDatabase(fileName,
-                    Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                    Globals.prefs.getImportFormatPreferences(), Globals.prefs.getTimestampPreferences(), Globals.getFileUpdateMonitor());
 
             if (parsedDatabase.isEmpty()) {
                 LOGGER.error(Localization.lang("Error opening file") + " '" + dbFile.getPath() + "'");
diff --git a/src/main/java/org/jabref/gui/StartLiteratureReviewAction.java b/src/main/java/org/jabref/gui/StartLiteratureReviewAction.java
index f6db57b4727..ef2cf84a69f 100644
--- a/src/main/java/org/jabref/gui/StartLiteratureReviewAction.java
+++ b/src/main/java/org/jabref/gui/StartLiteratureReviewAction.java
@@ -58,7 +58,7 @@ public void execute() {
         }
         final Crawler crawler;
         try {
-            crawler = new Crawler(studyDefinitionFile.get(), new GitHandler(studyDefinitionFile.get().getParent()), fileUpdateMonitor, importFormatPreferneces, savePreferences, new BibEntryTypesManager());
+            crawler = new Crawler(studyDefinitionFile.get(), new GitHandler(studyDefinitionFile.get().getParent()), fileUpdateMonitor, importFormatPreferneces, savePreferences, preferencesService.getTimestampPreferences(), new BibEntryTypesManager());
         } catch (IOException | ParseException | GitAPIException e) {
             LOGGER.error("Error during reading of study definition file.", e);
             dialogService.showErrorDialogAndWait(Localization.lang("Error during reading of study definition file."), e);
diff --git a/src/main/java/org/jabref/gui/UpdateTimestampListener.java b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
index 7af68d7a415..0efc6878d2b 100644
--- a/src/main/java/org/jabref/gui/UpdateTimestampListener.java
+++ b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
@@ -1,6 +1,7 @@
 package org.jabref.gui;
 
 import org.jabref.model.entry.event.EntryChangedEvent;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
 
 import com.google.common.eventbus.Subscribe;
@@ -17,8 +18,8 @@ class UpdateTimestampListener {
 
     @Subscribe
     public void listen(EntryChangedEvent event) {
-        if (preferencesService.getTimestampPreferences().shouldIncludeTimestamps()) {
-            event.getBibEntry().setField(preferencesService.getTimestampPreferences().getTimestampField(),
+        if (preferencesService.getTimestampPreferences().shouldAddModificationDate()) {
+            event.getBibEntry().setField(StandardField.MODIFICATIONDATE,
                     preferencesService.getTimestampPreferences().now());
         }
     }
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index 4806d156a86..910fe25ad8e 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -40,7 +40,7 @@ public List<DatabaseChangeViewModel> scanForChanges() {
             // Parse the modified file
             // Important: apply all post-load actions
             ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
-            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), importFormatPreferences, new DummyFileUpdateMonitor());
+            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), importFormatPreferences, preferencesService.getTimestampPreferences(), new DummyFileUpdateMonitor());
             BibDatabaseContext databaseOnDisk = result.getDatabaseContext();
 
             // Start looking at changes.
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index dcb570a82cd..4b8e3309946 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -54,7 +54,7 @@ public ImportHandler(DialogService dialogService,
         this.stateManager = stateManager;
 
         this.linker = new ExternalFilesEntryLinker(externalFileTypes, preferencesService.getFilePreferences(), database);
-        this.contentImporter = new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences());
+        this.contentImporter = new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences(), preferencesService.getTimestampPreferences());
         this.undoManager = undoManager;
     }
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportAction.java b/src/main/java/org/jabref/gui/importer/ImportAction.java
index 38bf8004dd1..6a2bf12c086 100644
--- a/src/main/java/org/jabref/gui/importer/ImportAction.java
+++ b/src/main/java/org/jabref/gui/importer/ImportAction.java
@@ -110,7 +110,7 @@ private List<ImportFormatReader.UnknownFormatImport> doImport(List<Path> files)
                     // Unknown format:
                     DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(Localization.lang("Importing in unknown format") + "..."));
                     // This import method never throws an IOException:
-                    imports.add(Globals.IMPORT_FORMAT_READER.importUnknownFormat(filename, Globals.getFileUpdateMonitor()));
+                    imports.add(Globals.IMPORT_FORMAT_READER.importUnknownFormat(filename, prefs.getTimestampPreferences(), Globals.getFileUpdateMonitor()));
                 } else {
                     DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(Localization.lang("Importing in %0 format", importer.get().getName()) + "..."));
                     // Specific importer:
diff --git a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
index 16a4bd4e0f0..b382f9f0be8 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -184,7 +184,7 @@ private ParserResult loadDatabase(Path file) throws Exception {
         }
 
         ParserResult result = OpenDatabase.loadDatabase(fileToLoad.toString(),
-                Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                Globals.prefs.getImportFormatPreferences(), Globals.prefs.getTimestampPreferences(), Globals.getFileUpdateMonitor());
 
         if (result.getDatabase().isShared()) {
             try {
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index fc30802e771..101147a10fa 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -56,31 +56,6 @@
     </HBox>
 
     <Label styleClass="sectionHeader" text="%Time stamp"/>
-    <CheckBox fx:id="markTimestamp" text="%Mark new entries with addition date"/>
-    <HBox spacing="10.0">
-        <GridPane hgap="10.0" vgap="4.0">
-            <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES"/>
-                <ColumnConstraints hgrow="SOMETIMES"/>
-                <ColumnConstraints hgrow="SOMETIMES"/>
-                <ColumnConstraints hgrow="SOMETIMES"/>
-            </columnConstraints>
-            <rowConstraints>
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
-            </rowConstraints>
-            <Label fx:id="markTimeStampFormatLabel" text="%Date format"/>
-            <TextField fx:id="markTimeStampFormat" prefWidth="200.0" GridPane.columnIndex="1"/>
-            <CheckBox fx:id="markTimeStampOverwrite" text="%Overwrite" GridPane.columnIndex="2">
-                <tooltip>
-                    <Tooltip text="%If a pasted or imported entry already has the field set, overwrite."/>
-                </tooltip>
-            </CheckBox>
-            <Button fx:id="markTimeStampHelp" prefWidth="20.0" GridPane.columnIndex="3"/>
-            <Label fx:id="markTimeStampFieldNameLabel" text="%Field name" GridPane.rowIndex="1"/>
-            <TextField fx:id="markTimeStampFieldName" prefWidth="200.0" GridPane.columnIndex="1"
-                       GridPane.rowIndex="1"/>
-        </GridPane>
-    </HBox>
-    <CheckBox fx:id="updateTimeStamp" text="%Update timestamp on modification"/>
+    <CheckBox fx:id="addCreationDate" text="%Add timestamp to new entries (field &quot;creationdate&quot;)"/>
+    <CheckBox fx:id="addModificationDate" text="%Add timestamp to modified entries (field &quot;modificationdate&quot;)"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index b861f86e20f..bf9c088ddf4 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -2,12 +2,10 @@
 
 import java.nio.charset.Charset;
 
-import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
-import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.Globals;
@@ -40,14 +38,8 @@ public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewMode
     @FXML private TextField markOwnerName;
     @FXML private CheckBox markOwnerOverwrite;
     @FXML private Button markOwnerHelp;
-    @FXML private CheckBox markTimestamp;
-    @FXML private TextField markTimeStampFormat;
-    @FXML private Label markTimeStampFormatLabel;
-    @FXML private CheckBox markTimeStampOverwrite;
-    @FXML private TextField markTimeStampFieldName;
-    @FXML private Label markTimeStampFieldNameLabel;
-    @FXML private Button markTimeStampHelp;
-    @FXML private CheckBox updateTimeStamp;
+    @FXML private CheckBox addCreationDate;
+    @FXML private CheckBox addModificationDate;
 
     private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
@@ -98,22 +90,12 @@ public void initialize() {
         markOwnerOverwrite.selectedProperty().bindBidirectional(viewModel.markOwnerOverwriteProperty());
         markOwnerOverwrite.disableProperty().bind(markOwner.selectedProperty().not());
 
-        markTimestamp.selectedProperty().bindBidirectional(viewModel.markTimestampProperty());
-        markTimeStampFormatLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampFormat.textProperty().bindBidirectional(viewModel.markTimeStampFormatProperty());
-        markTimeStampFormat.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampOverwrite.selectedProperty().bindBidirectional(viewModel.markTimeStampOverwriteProperty());
-        markTimeStampOverwrite.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampFieldNameLabel.disableProperty().bind(markTimestamp.selectedProperty().not());
-        markTimeStampFieldName.textProperty().bindBidirectional(viewModel.markTimeStampFieldNameProperty());
-        markTimeStampFieldName.disableProperty().bind(markTimestamp.selectedProperty().not());
-        updateTimeStamp.selectedProperty().bindBidirectional(viewModel.updateTimeStampProperty());
+        addCreationDate.selectedProperty().bindBidirectional(viewModel.addCreationDateProperty());
+        addModificationDate.selectedProperty().bindBidirectional(viewModel.addModificationDateProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER), markOwnerHelp);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.TIMESTAMP), markTimeStampHelp);
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.markTimeStampFormatValidationStatus(), markTimeStampFormat));
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
index f0efd067e8c..ceef74d1978 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.preferences;
 
 import java.nio.charset.Charset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -22,16 +21,10 @@
 import org.jabref.logic.preferences.OwnerPreferences;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabaseMode;
-import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.GeneralPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.TelemetryPreferences;
 
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-
 public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final ListProperty<Language> languagesListProperty = new SimpleListProperty<>();
     private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
@@ -49,13 +42,8 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
     private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
     private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
-    private final BooleanProperty markTimestampProperty = new SimpleBooleanProperty();
-    private final StringProperty markTimeStampFormatProperty = new SimpleStringProperty("");
-    private final BooleanProperty markTimeStampOverwriteProperty = new SimpleBooleanProperty();
-    private final StringProperty markTimeStampFieldNameProperty = new SimpleStringProperty("");
-    private final BooleanProperty updateTimeStampProperty = new SimpleBooleanProperty();
-
-    private Validator markTimeStampFormatValidator;
+    private final BooleanProperty addCreationDateProperty = new SimpleBooleanProperty();
+    private final BooleanProperty addModificationDateProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -74,25 +62,6 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
         this.initialTelemetryPreferences = preferencesService.getTelemetryPreferences();
         this.initialOwnerPreferences = preferencesService.getOwnerPreferences();
         this.initialTimestampPreferences = preferencesService.getTimestampPreferences();
-
-        markTimeStampFormatValidator = new FunctionBasedValidator<>(
-                markTimeStampFormatProperty,
-                input -> {
-                    try {
-                        DateTimeFormatter.ofPattern(markTimeStampFormatProperty.getValue());
-                    } catch (IllegalArgumentException exception) {
-                        return false;
-                    }
-                    return true;
-                },
-                ValidationMessage.error(String.format("%s > %s > %s %n %n %s",
-                        Localization.lang("General"),
-                        Localization.lang("Time stamp"),
-                        Localization.lang("Date format"),
-                        Localization.lang("Invalid date format")
-                        )
-                )
-        );
     }
 
     public void setValues() {
@@ -116,11 +85,8 @@ public void setValues() {
         markOwnerNameProperty.setValue(initialOwnerPreferences.getDefaultOwner());
         markOwnerOverwriteProperty.setValue(initialOwnerPreferences.isOverwriteOwner());
 
-        markTimestampProperty.setValue(initialTimestampPreferences.shouldUseTimestamps());
-        markTimeStampFormatProperty.setValue(initialTimestampPreferences.getTimestampFormat());
-        markTimeStampOverwriteProperty.setValue(initialTimestampPreferences.shouldOverwriteTimestamp());
-        markTimeStampFieldNameProperty.setValue(initialTimestampPreferences.getTimestampField().getName());
-        updateTimeStampProperty.setValue(initialTimestampPreferences.shouldUpdateTimestamp());
+        addCreationDateProperty.setValue(initialTimestampPreferences.shouldAddCreationDate());
+        addModificationDateProperty.setValue(initialTimestampPreferences.shouldAddModificationDate());
     }
 
     public void storeSettings() {
@@ -155,24 +121,14 @@ public void storeSettings() {
                 markOwnerOverwriteProperty.getValue()));
 
         preferencesService.storeTimestampPreferences(new TimestampPreferences(
-                markTimestampProperty.getValue(),
-                updateTimeStampProperty.getValue(),
-                FieldFactory.parseField(markTimeStampFieldNameProperty.getValue().trim()),
-                markTimeStampFormatProperty.getValue().trim(),
-                markTimeStampOverwriteProperty.getValue()));
-    }
-
-    public ValidationStatus markTimeStampFormatValidationStatus() {
-        return markTimeStampFormatValidator.getValidationStatus();
+                addCreationDateProperty.getValue(),
+                addModificationDateProperty.getValue(),
+                initialTimestampPreferences.shouldUpdateTimestamp(),
+                initialTimestampPreferences.getTimestampField(),
+                initialTimestampPreferences.getTimestampFormat()));
     }
 
     public boolean validateSettings() {
-        ValidationStatus validationStatus = markTimeStampFormatValidationStatus();
-        if (!validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
-            return false;
-        }
         return true;
     }
 
@@ -247,23 +203,11 @@ public BooleanProperty markOwnerOverwriteProperty() {
 
     // Time stamp
 
-    public BooleanProperty markTimestampProperty() {
-        return this.markTimestampProperty;
-    }
-
-    public StringProperty markTimeStampFormatProperty() {
-        return this.markTimeStampFormatProperty;
-    }
-
-    public BooleanProperty markTimeStampOverwriteProperty() {
-        return this.markTimeStampOverwriteProperty;
-    }
-
-    public StringProperty markTimeStampFieldNameProperty() {
-        return this.markTimeStampFieldNameProperty;
+    public BooleanProperty addCreationDateProperty() {
+        return addCreationDateProperty;
     }
 
-    public BooleanProperty updateTimeStampProperty() {
-        return this.updateTimeStampProperty;
+    public BooleanProperty addModificationDateProperty() {
+        return addModificationDateProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index 4d5552a8cc0..acd279de509 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -199,7 +199,7 @@ public void parseButtonClicked() {
         }
 
         TexBibEntriesResolver entriesResolver = new TexBibEntriesResolver(databaseContext.getDatabase(),
-                preferencesService.getImportFormatPreferences(), fileMonitor);
+                preferencesService.getImportFormatPreferences(), preferencesService.getTimestampPreferences(), fileMonitor);
 
         BackgroundTask.wrap(() -> entriesResolver.resolve(new DefaultLatexParser().parse(fileList)))
                       .onRunning(() -> searchInProgress.set(true))
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index 810c25f6011..50feab3cdab 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -8,6 +8,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.study.QueryResult;
 import org.jabref.model.study.Study;
@@ -32,9 +33,9 @@ public class Crawler {
      * @param studyDefinitionFile The path to the study definition file that contains the list of targeted E-Libraries
      *                            and used cross-library queries
      */
-    public Crawler(Path studyDefinitionFile, GitHandler gitHandler, FileUpdateMonitor fileUpdateMonitor, ImportFormatPreferences importFormatPreferences, SavePreferences savePreferences, BibEntryTypesManager bibEntryTypesManager) throws IllegalArgumentException, IOException, ParseException, GitAPIException {
+    public Crawler(Path studyDefinitionFile, GitHandler gitHandler, FileUpdateMonitor fileUpdateMonitor, ImportFormatPreferences importFormatPreferences, SavePreferences savePreferences, TimestampPreferences timestampPreferences, BibEntryTypesManager bibEntryTypesManager) throws IllegalArgumentException, IOException, ParseException, GitAPIException {
         Path studyRepositoryRoot = studyDefinitionFile.getParent();
-        studyRepository = new StudyRepository(studyRepositoryRoot, gitHandler, importFormatPreferences, fileUpdateMonitor, savePreferences, bibEntryTypesManager);
+        studyRepository = new StudyRepository(studyRepositoryRoot, gitHandler, importFormatPreferences, fileUpdateMonitor, savePreferences, timestampPreferences, bibEntryTypesManager);
         Study study = studyRepository.getStudy();
         LibraryEntryToFetcherConverter libraryEntryToFetcherConverter = new LibraryEntryToFetcherConverter(study.getActiveLibraryEntries(), importFormatPreferences);
         this.studyFetcher = new StudyFetcher(libraryEntryToFetcherConverter.getActiveFetchers(), study.getSearchQueryStrings());
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index 3474648f01a..9971ab9dfb1 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -23,6 +23,7 @@
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.logic.importer.fileformat.BibtexParser;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -59,6 +60,7 @@ class StudyRepository {
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final SavePreferences savePreferences;
+    private final TimestampPreferences timestampPreferences;
     private final BibEntryTypesManager bibEntryTypesManager;
 
     /**
@@ -77,6 +79,7 @@ public StudyRepository(Path pathToRepository,
                            ImportFormatPreferences importFormatPreferences,
                            FileUpdateMonitor fileUpdateMonitor,
                            SavePreferences savePreferences,
+                           TimestampPreferences timestampPreferences,
                            BibEntryTypesManager bibEntryTypesManager) throws IOException, ParseException {
         this.repositoryPath = pathToRepository;
         this.gitHandler = gitHandler;
@@ -89,6 +92,7 @@ public StudyRepository(Path pathToRepository,
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.studyDefinitionBib = Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
         this.savePreferences = savePreferences;
+        this.timestampPreferences = timestampPreferences;
         this.bibEntryTypesManager = bibEntryTypesManager;
 
         if (Files.notExists(repositoryPath)) {
@@ -104,21 +108,21 @@ public StudyRepository(Path pathToRepository,
      * Returns entries stored in the repository for a certain query and fetcher
      */
     public BibDatabaseContext getFetcherResultEntries(String query, String fetcherName) throws IOException {
-        return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+        return OpenDatabase.loadDatabase(getPathToFetcherResultFile(query, fetcherName), importFormatPreferences, timestampPreferences, fileUpdateMonitor).getDatabaseContext();
     }
 
     /**
      * Returns the merged entries stored in the repository for a certain query
      */
     public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
-        return OpenDatabase.loadDatabase(getPathToQueryResultFile(query), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+        return OpenDatabase.loadDatabase(getPathToQueryResultFile(query), importFormatPreferences, timestampPreferences, fileUpdateMonitor).getDatabaseContext();
     }
 
     /**
      * Returns the merged entries stored in the repository for all queries
      */
     public BibDatabaseContext getStudyResultEntries() throws IOException {
-        return OpenDatabase.loadDatabase(getPathToStudyResultFile(), importFormatPreferences, fileUpdateMonitor).getDatabaseContext();
+        return OpenDatabase.loadDatabase(getPathToStudyResultFile(), importFormatPreferences, timestampPreferences, fileUpdateMonitor).getDatabaseContext();
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
index e73710bc3ce..fcafa9f1e64 100644
--- a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -9,15 +9,18 @@
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfContentImporter;
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
 public class ExternalFilesContentImporter {
 
     private final ImportFormatPreferences importFormatPreferences;
+    private final TimestampPreferences timestampPreferences;
 
-    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences) {
+    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences, TimestampPreferences timestampPreferences) {
         this.importFormatPreferences = importFormatPreferences;
+        this.timestampPreferences = timestampPreferences;
     }
 
     public List<BibEntry> importPDFContent(Path file) {
@@ -29,7 +32,7 @@ public List<BibEntry> importXMPContent(Path file) {
     }
 
     public List<BibEntry> importFromBibFile(Path bibFile, FileUpdateMonitor fileUpdateMonitor) {
-        ParserResult parserResult = OpenDatabase.loadDatabase(bibFile.toString(), importFormatPreferences, fileUpdateMonitor);
+        ParserResult parserResult = OpenDatabase.loadDatabase(bibFile.toString(), importFormatPreferences, timestampPreferences, fileUpdateMonitor);
         return parserResult.getDatabaseContext().getEntries();
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
index 2f56dffd0ad..3b00f3e5057 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -27,6 +27,7 @@
 import org.jabref.logic.importer.fileformat.RisImporter;
 import org.jabref.logic.importer.fileformat.SilverPlatterImporter;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
@@ -162,12 +163,12 @@ public UnknownFormatImport(String format, ParserResult parserResult) {
      *
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
      */
-    public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor fileMonitor) throws ImportException {
+    public UnknownFormatImport importUnknownFormat(Path filePath, TimestampPreferences timestampPreferences, FileUpdateMonitor fileMonitor) throws ImportException {
         Objects.requireNonNull(filePath);
 
         // First, see if it is a BibTeX file:
         try {
-            ParserResult parserResult = OpenDatabase.loadDatabase(filePath, importFormatPreferences, fileMonitor);
+            ParserResult parserResult = OpenDatabase.loadDatabase(filePath, importFormatPreferences, timestampPreferences, fileMonitor);
             if (parserResult.getDatabase().hasEntries() || !parserResult.getDatabase().hasNoStrings()) {
                 parserResult.setFile(filePath.toFile());
                 return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, parserResult);
@@ -185,7 +186,7 @@ public UnknownFormatImport importUnknownFormat(Path filePath, FileUpdateMonitor
      * Tries to import entries by iterating through the available import filters,
      * and keeping the import that seems the most promising
      *
-     * @param importDatabase the function to import the entries with a formatter
+     * @param importDatabase     the function to import the entries with a formatter
      * @param isRecognizedFormat the function to check whether the source is in the correct format for an importer
      * @return an UnknownFormatImport with the imported entries and metadata
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
@@ -247,5 +248,4 @@ public UnknownFormatImport importUnknownFormat(String data) throws ImportExcepti
 
         return importUnknownFormat(importer -> importer.importDatabase(data), importer -> importer.isRecognizedFormat(data));
     }
-
 }
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index 97780856ac4..3da89f9a5aa 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -8,10 +8,12 @@
 
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.specialfields.SpecialFieldsUtils;
 import org.jabref.migrations.ConvertLegacyExplicitGroups;
 import org.jabref.migrations.ConvertMarkingToGroups;
 import org.jabref.migrations.PostOpenMigration;
+import org.jabref.migrations.TimeStampToDateAddAndModify;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -30,10 +32,10 @@ private OpenDatabase() {
      *
      * @param name Name of the BIB-file to open
      * @return ParserResult which never is null
-     * @deprecated use {@link #loadDatabase(Path, ImportFormatPreferences, FileUpdateMonitor)} instead
+     * @deprecated use {@link #loadDatabase(Path, ImportFormatPreferences, TimestampPreferences, FileUpdateMonitor)} instead
      */
     @Deprecated
-    public static ParserResult loadDatabase(String name, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public static ParserResult loadDatabase(String name, ImportFormatPreferences importFormatPreferences, TimestampPreferences timestampPreferences, FileUpdateMonitor fileMonitor) {
         LOGGER.debug("Opening: " + name);
         Path file = Path.of(name);
 
@@ -46,7 +48,7 @@ public static ParserResult loadDatabase(String name, ImportFormatPreferences imp
         }
 
         try {
-            return OpenDatabase.loadDatabase(file, importFormatPreferences, fileMonitor);
+            return OpenDatabase.loadDatabase(file, importFormatPreferences, timestampPreferences, fileMonitor);
         } catch (IOException ex) {
             ParserResult pr = ParserResult.fromError(ex);
             pr.setFile(file.toFile());
@@ -58,7 +60,7 @@ public static ParserResult loadDatabase(String name, ImportFormatPreferences imp
     /**
      * Opens a new database.
      */
-    public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor)
+    public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences importFormatPreferences, TimestampPreferences timestampPreferences, FileUpdateMonitor fileMonitor)
             throws IOException {
         ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen,
                 importFormatPreferences.getEncoding());
@@ -70,15 +72,16 @@ public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences
             LOGGER.debug("Synchronized special fields based on keywords");
         }
 
-        performLoadDatabaseMigrations(result);
+        performLoadDatabaseMigrations(result, timestampPreferences);
 
         return result;
     }
 
-    private static void performLoadDatabaseMigrations(ParserResult parserResult) {
+    private static void performLoadDatabaseMigrations(ParserResult parserResult, TimestampPreferences timestampPreferences) {
         List<PostOpenMigration> postOpenMigrations = Arrays.asList(
                 new ConvertLegacyExplicitGroups(),
-                new ConvertMarkingToGroups()
+                new ConvertMarkingToGroups(),
+                new TimeStampToDateAddAndModify(timestampPreferences)
         );
 
         for (PostOpenMigration migration : postOpenMigrations) {
diff --git a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java b/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
index 7a139324c7c..388a8477aec 100644
--- a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
@@ -2,49 +2,58 @@
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 
 import org.jabref.model.entry.field.Field;
 
 public class TimestampPreferences {
-    private final boolean useTimestamps;
+    private final boolean addCreationDate;
+    private final boolean addModificationDate;
+
+    // These are old preferences. They are used for migration only.
     private final boolean updateTimestamp;
     private final Field timestampField;
     private final String timestampFormat;
-    private final boolean overwriteTimestamp;
 
-    public TimestampPreferences(boolean useTimestamps, boolean updateTimestamp, Field timestampField, String timestampFormat, boolean overwriteTimestamp) {
-        this.useTimestamps = useTimestamps;
+    public TimestampPreferences(boolean addCreationDate, boolean modifyTimestamp, boolean updateTimestamp, Field timestampField, String timestampFormat) {
+        this.addCreationDate = addCreationDate;
+        this.addModificationDate = modifyTimestamp;
         this.updateTimestamp = updateTimestamp;
         this.timestampField = timestampField;
         this.timestampFormat = timestampFormat;
-        this.overwriteTimestamp = overwriteTimestamp;
     }
 
-    public boolean shouldUseTimestamps() {
-        return useTimestamps;
+    public String now() {
+        // Milli-, Micro-, and Nanoseconds are not relevant to us, so we remove them
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS));
+    }
+
+    public boolean shouldAddCreationDate() {
+        return addCreationDate;
     }
 
+    public boolean shouldAddModificationDate() {
+        return addModificationDate;
+    }
+
+    /**
+     * Required for migration only.
+     */
     public boolean shouldUpdateTimestamp() {
         return updateTimestamp;
     }
 
+    /**
+     * Required for migration only.
+     */
     public Field getTimestampField() {
         return timestampField;
     }
 
+    /**
+     * Required for migration only.
+     */
     public String getTimestampFormat() {
         return timestampFormat;
     }
-
-    public boolean shouldOverwriteTimestamp() {
-        return overwriteTimestamp;
-    }
-
-    public boolean shouldIncludeTimestamps() {
-        return useTimestamps && updateTimestamp;
-    }
-
-    public String now() {
-        return DateTimeFormatter.ofPattern(timestampFormat).format(LocalDateTime.now());
-    }
 }
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index cae1205a928..c3a1fef8c8f 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -9,6 +9,7 @@
 
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.texparser.Citation;
@@ -20,11 +21,13 @@ public class TexBibEntriesResolver {
 
     private final BibDatabase masterDatabase;
     private final ImportFormatPreferences importFormatPreferences;
+    private final TimestampPreferences timestampPreferences;
     private final FileUpdateMonitor fileMonitor;
 
-    public TexBibEntriesResolver(BibDatabase masterDatabase, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public TexBibEntriesResolver(BibDatabase masterDatabase, ImportFormatPreferences importFormatPreferences, TimestampPreferences timestampPreferences, FileUpdateMonitor fileMonitor) {
         this.masterDatabase = masterDatabase;
         this.importFormatPreferences = importFormatPreferences;
+        this.timestampPreferences = timestampPreferences;
         this.fileMonitor = fileMonitor;
     }
 
@@ -36,7 +39,7 @@ public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult
 
         // Preload databases from BIB files.
         Map<Path, BibDatabase> bibDatabases = resolverResult.getBibFiles().values().stream().distinct().collect(Collectors.toMap(
-                Function.identity(), path -> OpenDatabase.loadDatabase(path.toString(), importFormatPreferences, fileMonitor).getDatabase()));
+                Function.identity(), path -> OpenDatabase.loadDatabase(path.toString(), importFormatPreferences, timestampPreferences, fileMonitor).getDatabase()));
 
         // Get all pairs Entry<String entryKey, Citation>.
         Stream<Map.Entry<String, Citation>> citationsStream = latexParserResult.getCitations().entries().stream().distinct();
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 9c63e18788b..02ba49370bd 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Optional;
 
@@ -93,25 +91,14 @@ public static Optional<FieldChange> updateField(BibEntry be, Field field, String
     public static void setAutomaticFields(BibEntry entry, boolean overwriteOwner, boolean overwriteTimestamp,
                                           OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
         String defaultOwner = ownerPreferences.getDefaultOwner();
-        String timestamp = DateTimeFormatter.ofPattern(timestampPreferences.getTimestampFormat()).format(LocalDateTime.now());
-        Field timeStampField = timestampPreferences.getTimestampField();
+        String timestamp = timestampPreferences.now();
         boolean setOwner = ownerPreferences.isUseOwner() && (overwriteOwner || (!entry.hasField(StandardField.OWNER)));
-        boolean setTimeStamp = timestampPreferences.shouldUseTimestamps() && (overwriteTimestamp || (!entry.hasField(timeStampField)));
+        boolean setTimeStamp = timestampPreferences.shouldAddCreationDate();
 
-        setAutomaticFields(entry, setOwner, defaultOwner, setTimeStamp, timeStampField, timestamp);
+        setAutomaticFields(entry, setOwner, defaultOwner, setTimeStamp, timestamp);
     }
 
-    public static void setAutomaticFields(BibEntry entry,
-                                          OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
-        UpdateField.setAutomaticFields(entry,
-                ownerPreferences.isOverwriteOwner(),
-                timestampPreferences.shouldOverwriteTimestamp(),
-                ownerPreferences,
-                timestampPreferences);
-    }
-
-    private static void setAutomaticFields(BibEntry entry, boolean setOwner, String owner, boolean setTimeStamp,
-                                           Field timeStampField, String timeStamp) {
+    private static void setAutomaticFields(BibEntry entry, boolean setOwner, String owner, boolean setTimeStamp, String timeStamp) {
 
         // Set owner field if this option is enabled:
         if (setOwner) {
@@ -120,7 +107,7 @@ private static void setAutomaticFields(BibEntry entry, boolean setOwner, String
         }
 
         if (setTimeStamp) {
-            entry.setField(timeStampField, timeStamp);
+            entry.setField(StandardField.CREATIONDATE, timeStamp);
         }
     }
 
@@ -130,26 +117,24 @@ private static void setAutomaticFields(BibEntry entry, boolean setOwner, String
      *
      * @param bibs List of bibtex entries
      */
-    public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwriteOwner, boolean overwriteTimestamp,
+    public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwriteOwner,
                                           OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
 
         boolean globalSetOwner = ownerPreferences.isUseOwner();
-        boolean globalSetTimeStamp = timestampPreferences.shouldUseTimestamps();
+        boolean setTimeStamp = timestampPreferences.shouldAddCreationDate();
 
         // Do not need to do anything if all options are disabled
-        if (!(globalSetOwner || globalSetTimeStamp)) {
+        if (!(globalSetOwner || setTimeStamp)) {
             return;
         }
 
-        Field timeStampField = timestampPreferences.getTimestampField();
         String defaultOwner = ownerPreferences.getDefaultOwner();
-        String timestamp = DateTimeFormatter.ofPattern(timestampPreferences.getTimestampFormat()).format(LocalDateTime.now());
+        String timestamp = timestampPreferences.now();
 
         // Iterate through all entries
         for (BibEntry curEntry : bibs) {
             boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
-            boolean setTimeStamp = globalSetTimeStamp && (overwriteTimestamp || (!curEntry.hasField(timeStampField)));
-            setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timeStampField, timestamp);
+            setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timestamp);
         }
     }
 
@@ -157,7 +142,6 @@ public static void setAutomaticFields(Collection<BibEntry> bibs,
                                           OwnerPreferences ownerPreferences, TimestampPreferences timestampPreferences) {
         UpdateField.setAutomaticFields(bibs,
                 ownerPreferences.isOverwriteOwner(),
-                timestampPreferences.shouldOverwriteTimestamp(),
                 ownerPreferences,
                 timestampPreferences);
     }
diff --git a/src/main/java/org/jabref/migrations/TimeStampToDateAddAndModify.java b/src/main/java/org/jabref/migrations/TimeStampToDateAddAndModify.java
new file mode 100644
index 00000000000..b260009a0d4
--- /dev/null
+++ b/src/main/java/org/jabref/migrations/TimeStampToDateAddAndModify.java
@@ -0,0 +1,83 @@
+package org.jabref.migrations;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Optional;
+
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.Date;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+
+/**
+ * This class handles the migration from timestamp field to creationdate and modificationdate fields.
+ * <p>
+ * If the old updateTimestamp setting is enabled, the timestamp field for each entry are migrated to the date-modified field.
+ * Otherwise it is migrated to the date-added field.
+ */
+public class TimeStampToDateAddAndModify implements PostOpenMigration {
+
+    private final boolean interpretTimeStampAsModificationDate;
+    private final Field timeStampField;
+    private final TimestampPreferences timestampPreferences;
+
+    public TimeStampToDateAddAndModify(TimestampPreferences timestampPreferences) {
+        this.timestampPreferences = timestampPreferences;
+        interpretTimeStampAsModificationDate = timestampPreferences.shouldUpdateTimestamp();
+        timeStampField = timestampPreferences.getTimestampField();
+    }
+
+    @Override
+    public void performMigration(ParserResult parserResult) {
+        parserResult.getDatabase().getEntries().forEach(this::migrateEntry);
+    }
+
+    private void migrateEntry(BibEntry entry) {
+        // Query entries for their timestamp field entries
+        entry.getField(timeStampField).ifPresent(timeStamp -> {
+            String formattedTimeStamp = formatTimeStamp(timeStamp);
+            if (interpretTimeStampAsModificationDate) {
+                entry.setField(StandardField.MODIFICATIONDATE, formattedTimeStamp);
+            } else {
+                entry.setField(StandardField.CREATIONDATE, formattedTimeStamp);
+            }
+            entry.clearField(timeStampField);
+        });
+    }
+
+    /**
+     * Formats the time stamp into the local date and time format.
+     * If the existing timestamp could not be parsed, the day/month/year "1" is used.
+     * For the time portion 00:00:00 is used.
+     */
+    private String formatTimeStamp(String timeStamp) {
+        Optional<Date> parsedDate = Date.parse(timeStamp);
+        if (parsedDate.isEmpty()) {
+            // What to do if the date cannot be parsed? Do we need the custom date format possibly?
+            return timestampPreferences.now();
+        } else {
+            Date date = parsedDate.get();
+            int year = date.getYear().orElse(1);
+            int month = getMonth(date);
+            int day = date.getDay().orElse(1);
+            LocalDateTime localDateTime = LocalDateTime.of(year, month, day, 0, 0);
+            // Remove any time unites smaller than seconds
+            localDateTime.truncatedTo(ChronoUnit.SECONDS);
+            return localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
+        }
+    }
+
+    /**
+     * Returns the month value of the passed date if available.
+     * Otherwise returns the current month.
+     */
+    private int getMonth(Date date) {
+        if (date.getMonth().isPresent()) {
+            return date.getMonth().get().getNumber();
+        }
+        return 1;
+    }
+}
diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java
index 10d5457a7d8..b0479ad355e 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -9,6 +9,7 @@
 import java.time.temporal.TemporalAccessor;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -60,7 +61,8 @@ public static Optional<Date> parse(String dateString) {
 
         for (String formatString : formatStrings) {
             try {
-                TemporalAccessor parsedDate = DateTimeFormatter.ofPattern(formatString).parse(dateString);
+                // Locale is required for parsing month names correctly. Currently this expects the month names to be in English
+                TemporalAccessor parsedDate = DateTimeFormatter.ofPattern(formatString).withLocale(Locale.US).parse(dateString);
                 return Optional.of(new Date(parsedDate));
             } catch (DateTimeParseException ignored) {
                 // Ignored
diff --git a/src/main/java/org/jabref/model/entry/field/StandardField.java b/src/main/java/org/jabref/model/entry/field/StandardField.java
index f86feca4a57..750f532612a 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -141,7 +141,10 @@ public enum StandardField implements Field {
     // JabRef-specific fields
     GROUPS("groups"),
     OWNER("owner"),
-    TIMESTAMP("timestamp", FieldProperty.DATE);
+    TIMESTAMP("timestamp", FieldProperty.DATE),
+    CREATIONDATE("creationdate", FieldProperty.DATE),
+    MODIFICATIONDATE("modificationdate", FieldProperty.DATE);
+
 
     private final String name;
     private final String displayName;
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 174849b9ce6..f29c7d347a1 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -205,11 +205,13 @@ public class JabRefPreferences implements PreferencesService {
     public static final String DEFAULT_OWNER = "defaultOwner";
     public static final String OVERWRITE_OWNER = "overwriteOwner";
 
-    public static final String USE_TIME_STAMP = "useTimeStamp";
+    // Required for migration from pre-v5.3 only
     public static final String UPDATE_TIMESTAMP = "updateTimestamp";
     public static final String TIME_STAMP_FIELD = "timeStampField";
     public static final String TIME_STAMP_FORMAT = "timeStampFormat";
-    public static final String OVERWRITE_TIME_STAMP = "overwriteTimeStamp";
+
+    public static final String ADD_CREATION_DATE = "addCreationDate";
+    public static final String ADD_MODIFICATION_DATE = "addModificationDate";
 
     public static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION = "warnAboutDuplicatesInInspection";
     public static final String NON_WRAPPABLE_FIELDS = "nonWrappableFields";
@@ -581,15 +583,14 @@ private JabRefPreferences() {
         defaults.put(RESOLVE_STRINGS_ALL_FIELDS, Boolean.FALSE);
         defaults.put(NON_WRAPPABLE_FIELDS, "pdf;ps;url;doi;file;isbn;issn");
         defaults.put(WARN_ABOUT_DUPLICATES_IN_INSPECTION, Boolean.TRUE);
-        defaults.put(USE_TIME_STAMP, Boolean.FALSE);
-        defaults.put(OVERWRITE_TIME_STAMP, Boolean.FALSE);
+        defaults.put(ADD_CREATION_DATE, Boolean.FALSE);
+        defaults.put(ADD_MODIFICATION_DATE, Boolean.FALSE);
 
+        defaults.put(UPDATE_TIMESTAMP, Boolean.FALSE);
+        defaults.put(TIME_STAMP_FIELD, StandardField.TIMESTAMP.getName());
         // default time stamp follows ISO-8601. Reason: https://xkcd.com/1179/
         defaults.put(TIME_STAMP_FORMAT, "yyyy-MM-dd");
 
-        defaults.put(TIME_STAMP_FIELD, StandardField.TIMESTAMP.getName());
-        defaults.put(UPDATE_TIMESTAMP, Boolean.FALSE);
-
         defaults.put(GENERATE_KEYS_BEFORE_SAVING, Boolean.FALSE);
 
         defaults.put(USE_REMOTE_SERVER, Boolean.TRUE);
@@ -1371,20 +1372,17 @@ public void storeOwnerPreferences(OwnerPreferences preferences) {
     @Override
     public TimestampPreferences getTimestampPreferences() {
         return new TimestampPreferences(
-                getBoolean(USE_TIME_STAMP),
+                getBoolean(ADD_CREATION_DATE),
+                getBoolean(ADD_MODIFICATION_DATE),
                 getBoolean(UPDATE_TIMESTAMP),
                 FieldFactory.parseField(get(TIME_STAMP_FIELD)),
-                get(TIME_STAMP_FORMAT),
-                getBoolean(OVERWRITE_TIME_STAMP));
+                get(TIME_STAMP_FORMAT));
     }
 
     @Override
     public void storeTimestampPreferences(TimestampPreferences preferences) {
-        putBoolean(USE_TIME_STAMP, preferences.shouldUseTimestamps());
-        putBoolean(UPDATE_TIMESTAMP, preferences.shouldUpdateTimestamp());
-        put(TIME_STAMP_FIELD, preferences.getTimestampField().getName());
-        put(TIME_STAMP_FORMAT, preferences.getTimestampFormat());
-        putBoolean(OVERWRITE_TIME_STAMP, preferences.shouldOverwriteTimestamp());
+        putBoolean(ADD_CREATION_DATE, preferences.shouldAddCreationDate());
+        putBoolean(ADD_MODIFICATION_DATE, preferences.shouldAddModificationDate());
     }
 
     //*************************************************************************************************************
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 4895344a56b..5d5afe7f2a0 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -207,8 +207,6 @@ Library\ encoding=Library encoding
 
 Library\ properties=Library properties
 
-Date\ format=Date format
-
 Default=Default
 
 Default\ encoding=Default encoding
@@ -442,8 +440,6 @@ I\ Agree=I Agree
 
 Invalid\ citation\ key=Invalid citation key
 
-Invalid\ date\ format=Invalid date format
-
 Invalid\ URL=Invalid URL
 
 Online\ help=Online help
@@ -488,8 +484,6 @@ Manage\ custom\ exports=Manage custom exports
 Manage\ custom\ imports=Manage custom imports
 Manage\ external\ file\ types=Manage external file types
 
-Mark\ new\ entries\ with\ addition\ date=Mark new entries with addition date
-
 Mark\ new\ entries\ with\ owner\ name=Mark new entries with owner name
 
 Memory\ stick\ mode=Memory stick mode
@@ -1184,7 +1178,8 @@ Parse=Parse
 Result=Result
 You\ have\ to\ choose\ exactly\ two\ entries\ to\ merge.=You have to choose exactly two entries to merge.
 
-Update\ timestamp\ on\ modification=Update timestamp on modification
+Add\ timestamp\ to\ modified\ entries\ (field\ "modificationdate")=Add timestamp to modified entries (field "modificationdate")
+Add\ timestamp\ to\ new\ entries\ (field\ "creationdate")=Add timestamp to new entries (field "creationdate")
 All\ key\ bindings\ will\ be\ reset\ to\ their\ defaults.=All key bindings will be reset to their defaults.
 
 Automatically\ set\ file\ links=Automatically set file links
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index 92b0571fb67..23c29c4d623 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -5,7 +5,6 @@
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.preferences.PreferencesService;
@@ -40,47 +39,43 @@ void setUp() {
 
     @Test
     void updateTimestampEnabled() {
-        final Field timestampField = StandardField.TIMESTAMP;
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
 
         final boolean includeTimestamp = true;
 
-        when(timestampPreferencesMock.getTimestampField()).thenReturn(timestampField);
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldIncludeTimestamps()).thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
 
-        bibEntry.setField(timestampField, baseDate);
+        bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(timestampField), "Initial timestamp not set correctly");
+        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Initial timestamp not set correctly");
 
         database.registerListener(new UpdateTimestampListener(preferencesMock));
 
         bibEntry.setField(new UnknownField("test"), "some value");
 
-        assertEquals(Optional.of(newDate), bibEntry.getField(timestampField), "Timestamp not set correctly after entry changed");
+        assertEquals(Optional.of(newDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Timestamp not set correctly after entry changed");
     }
 
     @Test
     void updateTimestampDisabled() {
-        final Field timestampField = StandardField.TIMESTAMP;
         final String baseDate = "2000-1-1";
         final String newDate = "2000-1-2";
 
         final boolean includeTimestamp = false;
 
-        when(timestampPreferencesMock.getTimestampField()).thenReturn(timestampField);
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldIncludeTimestamps()).thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
 
-        bibEntry.setField(timestampField, baseDate);
+        bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(timestampField), "Initial timestamp not set correctly");
+        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "Initial timestamp not set correctly");
 
         database.registerListener(new UpdateTimestampListener(preferencesMock));
 
         bibEntry.setField(new UnknownField("test"), "some value");
 
-        assertEquals(Optional.of(baseDate), bibEntry.getField(timestampField), "New timestamp set after entry changed even though updates were disabled");
+        assertEquals(Optional.of(baseDate), bibEntry.getField(StandardField.MODIFICATIONDATE), "New timestamp set after entry changed even though updates were disabled");
     }
 }
diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index 9a821b409e6..dfa6e11ba9c 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.crawler.git.GitHandler;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrderConfig;
@@ -34,6 +35,7 @@ class CrawlerTest {
     Path tempRepositoryDirectory;
     ImportFormatPreferences importFormatPreferences;
     SavePreferences savePreferences;
+    TimestampPreferences timestampPreferences;
     BibEntryTypesManager entryTypesManager;
     GitHandler gitHandler = mock(GitHandler.class, Answers.RETURNS_DEFAULTS);
 
@@ -45,6 +47,7 @@ public void testWhetherAllFilesAreCreated() throws Exception {
                 new DummyFileUpdateMonitor(),
                 importFormatPreferences,
                 savePreferences,
+                timestampPreferences,
                 entryTypesManager
         );
 
@@ -91,6 +94,7 @@ private void setUp() throws Exception {
 
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class);
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.getEncoding()).thenReturn(null);
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
diff --git a/src/test/java/org/jabref/logic/crawler/LibraryEntryToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/LibraryEntryToFetcherConverterTest.java
index 629fad93ec4..013a9c118a7 100644
--- a/src/test/java/org/jabref/logic/crawler/LibraryEntryToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/LibraryEntryToFetcherConverterTest.java
@@ -10,6 +10,7 @@
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrderConfig;
@@ -28,6 +29,7 @@
 class LibraryEntryToFetcherConverterTest {
     ImportFormatPreferences importFormatPreferences;
     SavePreferences savePreferences;
+    TimestampPreferences timestampPreferences;
     BibEntryTypesManager entryTypesManager;
     GitHandler gitHandler;
     @TempDir
@@ -37,6 +39,7 @@ class LibraryEntryToFetcherConverterTest {
     void setUpMocks() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class);
         when(savePreferences.getSaveOrder()).thenReturn(new SaveOrderConfig());
         when(savePreferences.getEncoding()).thenReturn(null);
         when(savePreferences.takeMetadataSaveOrderInAccount()).thenReturn(true);
@@ -53,7 +56,7 @@ public void getActiveFetcherInstances() throws Exception {
         Path studyDefinition = tempRepositoryDirectory.resolve("study.bib");
         copyTestStudyDefinitionFileIntoDirectory(studyDefinition);
 
-        Study study = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager).getStudy();
+        Study study = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, timestampPreferences, entryTypesManager).getStudy();
         LibraryEntryToFetcherConverter converter = new LibraryEntryToFetcherConverter(study.getActiveLibraryEntries(), importFormatPreferences);
         List<SearchBasedFetcher> result = converter.getActiveFetchers();
 
diff --git a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
index c781fc3274e..171fbb70168 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -20,6 +20,7 @@
 import org.jabref.logic.database.DatabaseMerger;
 import org.jabref.logic.exporter.SavePreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -52,6 +53,7 @@ class StudyRepositoryTest {
     CitationKeyPatternPreferences citationKeyPatternPreferences;
     ImportFormatPreferences importFormatPreferences;
     SavePreferences savePreferences;
+    TimestampPreferences timestampPreferences;
     BibEntryTypesManager entryTypesManager;
     @TempDir
     Path tempRepositoryDirectory;
@@ -65,6 +67,7 @@ class StudyRepositoryTest {
     public void setUpMocks() {
         savePreferences = mock(SavePreferences.class, Answers.RETURNS_DEEP_STUBS);
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class);
         citationKeyPatternPreferences = new CitationKeyPatternPreferences(
                 false,
                 false,
@@ -83,6 +86,7 @@ public void setUpMocks() {
         when(importFormatPreferences.getFieldContentFormatterPreferences()).thenReturn(new FieldContentFormatterPreferences());
         when(importFormatPreferences.isKeywordSyncEnabled()).thenReturn(false);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
+        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
         entryTypesManager = new BibEntryTypesManager();
     }
 
@@ -90,12 +94,12 @@ public void setUpMocks() {
     void providePathToNonExistentRepositoryThrowsException() {
         Path nonExistingRepositoryDirectory = tempRepositoryDirectory.resolve(NON_EXISTING_DIRECTORY);
 
-        assertThrows(IOException.class, () -> new StudyRepository(nonExistingRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager));
+        assertThrows(IOException.class, () -> new StudyRepository(nonExistingRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, timestampPreferences, entryTypesManager));
     }
 
     @Test
     void providePathToExistentRepositoryWithOutStudyDefinitionFileThrowsException() {
-        assertThrows(IOException.class, () -> new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager));
+        assertThrows(IOException.class, () -> new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, timestampPreferences, entryTypesManager));
     }
 
     /**
@@ -107,7 +111,7 @@ void studyFileCorrectlyImported() throws Exception {
         List<String> expectedSearchterms = List.of("Quantum", "Cloud Computing", "TestSearchQuery3");
         List<String> expectedActiveFetchersByName = List.of("Springer", "ArXiv");
 
-        Study study = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager).getStudy();
+        Study study = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, timestampPreferences, entryTypesManager).getStudy();
 
         assertEquals(expectedSearchterms, study.getSearchQueryStrings());
         assertEquals("TestStudyName", study.getStudyMetaDataField(StudyMetaDataField.STUDY_NAME).get());
@@ -201,7 +205,7 @@ void studyResultsPersistedCorrectly() throws Exception {
     private StudyRepository getTestStudyRepository() throws Exception {
         if (Objects.isNull(studyRepository)) {
             setUpTestStudyDefinitionFile();
-            studyRepository = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, entryTypesManager);
+            studyRepository = new StudyRepository(tempRepositoryDirectory, gitHandler, importFormatPreferences, new DummyFileUpdateMonitor(), savePreferences, timestampPreferences, entryTypesManager);
         }
         return studyRepository;
     }
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
index ebeafccdae0..3f338e8d6e8 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -7,7 +7,9 @@
 import java.util.Collection;
 import java.util.stream.Stream;
 
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -22,12 +24,14 @@
 class ImportFormatReaderIntegrationTest {
 
     private ImportFormatReader reader;
+    private TimestampPreferences timestampPreferences = mock(TimestampPreferences.class);
 
     @BeforeEach
     void setUp() {
         reader = new ImportFormatReader();
         ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
+        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
         reader.resetImportFormats(importFormatPreferences, mock(XmpPreferences.class), new DummyFileUpdateMonitor());
     }
 
@@ -35,7 +39,7 @@ void setUp() {
     @MethodSource("importFormats")
     void testImportUnknownFormat(String resource, String format, int count) throws Exception {
         Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
-        ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(file, new DummyFileUpdateMonitor());
+        ImportFormatReader.UnknownFormatImport unknownFormat = reader.importUnknownFormat(file, timestampPreferences, new DummyFileUpdateMonitor());
         assertEquals(count, unknownFormat.parserResult.getDatabase().getEntryCount());
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
index 3a6230a1701..ab838803ae2 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderTestParameterless.java
@@ -3,6 +3,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -19,6 +20,7 @@ class ImportFormatReaderTestParameterless {
 
     private ImportFormatReader reader;
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
+    private final TimestampPreferences timestampPreferences = mock(TimestampPreferences.class);
 
     @BeforeEach
     void setUp() {
@@ -31,12 +33,12 @@ void setUp() {
     @Test
     void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exception {
         Path file = Path.of(ImportFormatReaderTestParameterless.class.getResource("fileformat/emptyFile.xml").toURI());
-        assertThrows(ImportException.class, () -> reader.importUnknownFormat(file, fileMonitor));
+        assertThrows(ImportException.class, () -> reader.importUnknownFormat(file, timestampPreferences, fileMonitor));
     }
 
     @Test
     void importUnknownFormatThrowsExceptionIfPathIsNull() throws Exception {
-        assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null, fileMonitor));
+        assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null, timestampPreferences, fileMonitor));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index a29f248fcc8..22e2cba90bf 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -8,6 +8,7 @@
 import java.util.Collection;
 import java.util.Optional;
 
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -26,6 +27,7 @@ class OpenDatabaseTest {
 
     private final Charset defaultEncoding = StandardCharsets.UTF_8;
     private ImportFormatPreferences importFormatPreferences;
+    private TimestampPreferences timestampPreferences;
     private final Path bibNoHeader;
     private final Path bibWrongHeader;
     private final Path bibHeader;
@@ -44,38 +46,40 @@ class OpenDatabaseTest {
     @BeforeEach
     void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
+        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
     }
 
     @Test
     void useFallbackEncodingIfNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, timestampPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useFallbackEncodingIfUnknownHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibWrongHeader, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibWrongHeader, importFormatPreferences, timestampPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncoding() throws IOException {
         ParserResult result = OpenDatabase.loadDatabase(bibHeader,
-                importFormatPreferences.withEncoding(StandardCharsets.US_ASCII), fileMonitor);
+                importFormatPreferences.withEncoding(StandardCharsets.US_ASCII), timestampPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void useSpecifiedEncodingWithSignature() throws IOException {
         ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature,
-                importFormatPreferences.withEncoding(StandardCharsets.US_ASCII), fileMonitor);
+                importFormatPreferences.withEncoding(StandardCharsets.US_ASCII), timestampPreferences, fileMonitor);
         assertEquals(defaultEncoding, result.getMetaData().getEncoding().get());
     }
 
     @Test
     void entriesAreParsedNoHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibNoHeader, importFormatPreferences, timestampPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -85,7 +89,7 @@ void entriesAreParsedNoHeader() throws IOException {
 
     @Test
     void entriesAreParsedHeader() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeader, importFormatPreferences, timestampPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -95,7 +99,7 @@ void entriesAreParsedHeader() throws IOException {
 
     @Test
     void entriesAreParsedHeaderAndSignature() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibHeaderAndSignature, importFormatPreferences, timestampPreferences, fileMonitor);
         BibDatabase db = result.getDatabase();
 
         // Entry
@@ -108,7 +112,7 @@ void entriesAreParsedHeaderAndSignature() throws IOException {
      */
     @Test
     void correctlyParseEncodingWithoutNewline() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, importFormatPreferences, fileMonitor);
+        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, importFormatPreferences, timestampPreferences, fileMonitor);
         assertEquals(StandardCharsets.US_ASCII, result.getMetaData().getEncoding().get());
 
         BibDatabase db = result.getDatabase();
diff --git a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index ccf70f598c6..4a2287aab03 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -6,6 +6,7 @@
 import java.util.Arrays;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -33,13 +34,16 @@ public class LatexParserTest {
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
     private ImportFormatPreferences importFormatPreferences;
+    private TimestampPreferences timestampPreferences;
     private BibDatabase database;
     private BibDatabase database2;
 
     @BeforeEach
     private void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
+        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
 
         database = new BibDatabase();
         database2 = new BibDatabase();
@@ -102,12 +106,12 @@ public void testSameFileDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
         expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
@@ -135,12 +139,12 @@ public void testTwoFilesDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
         expectedParserResult.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index 169d688cf36..81663ce3143 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -6,6 +6,7 @@
 import java.util.Arrays;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
+import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -33,6 +34,7 @@ public class TexBibEntriesResolverTest {
 
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
     private ImportFormatPreferences importFormatPreferences;
+    private TimestampPreferences timestampPreferences;
     private BibDatabase database;
     private BibDatabase database2;
     private BibEntry bibEntry;
@@ -40,6 +42,8 @@ public class TexBibEntriesResolverTest {
     @BeforeEach
     private void setUp() {
         importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        timestampPreferences = mock(TimestampPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
         when(importFormatPreferences.getEncoding()).thenReturn(StandardCharsets.UTF_8);
 
         database = new BibDatabase();
@@ -102,7 +106,7 @@ public void testSingleFile() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -114,7 +118,7 @@ public void testTwoFiles() throws URISyntaxException {
         Path texFile2 = Path.of(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -125,7 +129,7 @@ public void testDuplicateFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -136,7 +140,7 @@ public void testUnknownKey() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -147,7 +151,7 @@ public void testNestedFiles() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
@@ -158,7 +162,7 @@ public void testCrossRef() throws URISyntaxException {
         Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, timestampPreferences, fileMonitor).resolve(parserResult);
         LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         expectedCrossingResult.addEntry(bibEntry);
diff --git a/src/test/java/org/jabref/migrations/TimeStampToDateAddAndModifyTest.java b/src/test/java/org/jabref/migrations/TimeStampToDateAddAndModifyTest.java
new file mode 100644
index 00000000000..eaabac2cc10
--- /dev/null
+++ b/src/test/java/org/jabref/migrations/TimeStampToDateAddAndModifyTest.java
@@ -0,0 +1,255 @@
+package org.jabref.migrations;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.jabref.logic.importer.ParserResult;
+import org.jabref.logic.preferences.TimestampPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+import org.jabref.model.entry.field.StandardField;
+import org.jabref.model.entry.field.UnknownField;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mockito;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class TimeStampToDateAddAndModifyTest {
+
+    private static Field customTimeStampField = new UnknownField("dateOfCreation");
+
+    private TimestampPreferences timestampPreferences = Mockito.mock(TimestampPreferences.class);
+
+    public void makeMockReturnCustomField() {
+        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> customTimeStampField);
+    }
+
+    public void makeMockReturnStandardField() {
+        Mockito.when(timestampPreferences.getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+    }
+
+    public void makeMockToMigrateToCreationDate() {
+        Mockito.when(timestampPreferences.shouldUpdateTimestamp()).then(invocation -> Boolean.FALSE);
+    }
+
+    public void makeMockToMigrateToModificationDate() {
+        Mockito.when(timestampPreferences.shouldUpdateTimestamp()).then(invocation -> Boolean.TRUE);
+    }
+
+    public static Stream<Arguments> standardFieldToCreationDate() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
+                )
+        );
+    }
+
+    /**
+     * Tests migration to creationdate if the users uses the default ISO yyyy-mm-dd format and the standard timestamp field
+     */
+    @ParameterizedTest
+    @MethodSource("standardFieldToCreationDate")
+    public void withStandardFieldToCreationDate(BibEntry expected, BibEntry input) {
+        makeMockToMigrateToCreationDate();
+        makeMockReturnStandardField();
+        TimeStampToDateAddAndModify migrator = new TimeStampToDateAddAndModify(timestampPreferences);
+        ParserResult entries = new ParserResult(List.of(input));
+        migrator.performMigration(entries);
+        assertEquals(List.of(expected), entries.getDatabase().getEntries());
+    }
+
+    public static Stream<Arguments> customFieldToCreationDate() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2018-09-10")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-24")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-31")
+                )
+        );
+    }
+
+    /**
+     * Tests migration to creationdate if the users uses the default ISO yyyy-mm-dd format and a custom timestamp field
+     */
+    @ParameterizedTest
+    @MethodSource("customFieldToCreationDate")
+    public void withCustomFieldToCreationDate(BibEntry expected, BibEntry input) {
+        makeMockToMigrateToCreationDate();
+        makeMockReturnCustomField();
+        TimeStampToDateAddAndModify migrator = new TimeStampToDateAddAndModify(timestampPreferences);
+        ParserResult entries = new ParserResult(List.of(input));
+        migrator.performMigration(entries);
+        assertEquals(List.of(expected), entries.getDatabase().getEntries());
+    }
+
+    public static Stream<Arguments> standardFieldToModificationDate() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
+                )
+        );
+    }
+
+    /**
+     * Tests migration to modificationdate if the users uses the default ISO yyyy-mm-dd format and the standard timestamp field
+     */
+    @ParameterizedTest
+    @MethodSource("standardFieldToModificationDate")
+    public void withStandardFieldToModificationDate(BibEntry expected, BibEntry input) {
+        makeMockToMigrateToModificationDate();
+        makeMockReturnStandardField();
+        TimeStampToDateAddAndModify migrator = new TimeStampToDateAddAndModify(timestampPreferences);
+        ParserResult entries = new ParserResult(List.of(input));
+        migrator.performMigration(entries);
+        assertEquals(List.of(expected), entries.getDatabase().getEntries());
+    }
+
+    public static Stream<Arguments> customFieldToModificationDate() {
+        return Stream.of(
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2018-09-10T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2018-09-10")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-24T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-24")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
+                        new BibEntry().withField(customTimeStampField, "2020-12-31")
+                )
+        );
+    }
+
+    /**
+     * Tests migration to modificationdate if the users uses the default ISO yyyy-mm-dd format and a custom timestamp field
+     */
+    @ParameterizedTest
+    @MethodSource("customFieldToModificationDate")
+    public void withCustomFieldToModificationDate(BibEntry expected, BibEntry input) {
+        makeMockToMigrateToModificationDate();
+        makeMockReturnCustomField();
+        TimeStampToDateAddAndModify migrator = new TimeStampToDateAddAndModify(timestampPreferences);
+        ParserResult entries = new ParserResult(List.of(input));
+        migrator.performMigration(entries);
+        assertEquals(List.of(expected), entries.getDatabase().getEntries());
+    }
+
+    public static Stream<Arguments> entriesMigratedToCreationDateFromDifferentFormats() {
+        return Stream.of(
+                // M/y
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "1/18")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-02-01T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2/2018")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-03-01T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "03/2018")
+                ),
+
+                // MMMM, yyyy
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January, 2018")
+                ),
+
+                // MMMM dd, yyyy
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January 2, 2018")
+                ),
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "January 12, 2018")
+                ),
+
+                // dd-MM-yyyy
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2-1-2018")
+                ),
+
+                // Double digit day/month
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "12-01-2018")
+                ),
+
+                // d.M.uuuu
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2.1.2018")
+                ),
+
+                // Double digit day/month
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "12.01.2018")
+                ),
+
+                // uuuu.M.d
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.1.2")
+                ),
+
+                // Double digit day/month
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-12T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "2018.01.12")
+                ),
+
+                // MMM, uuuu
+                Arguments.of(
+                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
+                        new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")
+                ));
+    }
+
+    /**
+     * Tests migration of different timestamp formats with the standard timestamp field
+     */
+    @ParameterizedTest
+    @MethodSource("entriesMigratedToCreationDateFromDifferentFormats")
+    public void withDifferentFormats(BibEntry expected, BibEntry input) {
+        makeMockToMigrateToCreationDate();
+        makeMockReturnStandardField();
+        TimeStampToDateAddAndModify migrator = new TimeStampToDateAddAndModify(timestampPreferences);
+        ParserResult parserResult = new ParserResult(List.of(input));
+        migrator.performMigration(parserResult);
+        assertEquals(List.of(expected), parserResult.getDatabase().getEntries());
+    }
+
+}