diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 4f196e0f5..2850e2590 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -48,6 +48,8 @@ public class Account implements BaseAccount
private static final String DEFAULT_QUOTE_PREFIX = ">";
+ private static final boolean DEFAULT_REPLY_AFTER_QUOTE = false;
+
/**
*
* 0 - Never (DELETE_POLICY_NEVER)
@@ -109,6 +111,7 @@ public class Account implements BaseAccount
// current set of fetched messages
private boolean mRingNotified;
private String mQuotePrefix;
+ private boolean mReplyAfterQuote;
private boolean mSyncRemoteDeletions;
private String mCryptoApp;
private boolean mCryptoAutoSignature;
@@ -183,6 +186,7 @@ public class Account implements BaseAccount
maximumPolledMessageAge = -1;
maximumAutoDownloadMessageSize = 32768;
mQuotePrefix = DEFAULT_QUOTE_PREFIX;
+ mReplyAfterQuote = DEFAULT_REPLY_AFTER_QUOTE;
mSyncRemoteDeletions = true;
mCryptoApp = Apg.NAME;
mCryptoAutoSignature = false;
@@ -266,6 +270,7 @@ public class Account implements BaseAccount
maximumAutoDownloadMessageSize = prefs.getInt(mUuid
+ ".maximumAutoDownloadMessageSize", 32768);
mQuotePrefix = prefs.getString(mUuid + ".quotePrefix", DEFAULT_QUOTE_PREFIX);
+ mReplyAfterQuote = prefs.getBoolean(mUuid + ".replyAfterQuote", DEFAULT_REPLY_AFTER_QUOTE);
for (String type : networkTypes)
{
Boolean useCompression = prefs.getBoolean(mUuid + ".useCompression." + type,
@@ -1440,6 +1445,16 @@ public class Account implements BaseAccount
mQuotePrefix = quotePrefix;
}
+ public synchronized boolean isReplyAfterQuote()
+ {
+ return mReplyAfterQuote;
+ }
+
+ public synchronized void setReplyAfterQuote(boolean replyAfterQuote)
+ {
+ mReplyAfterQuote = replyAfterQuote;
+ }
+
public boolean getEnableMoveButtons()
{
return mEnableMoveButtons;
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 5cd2b2143..7e34a4434 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -71,6 +71,7 @@ public class AccountSettings extends K9PreferenceActivity
private static final String PREFERENCE_MESSAGE_AGE = "account_message_age";
private static final String PREFERENCE_MESSAGE_SIZE = "account_autodownload_size";
private static final String PREFERENCE_QUOTE_PREFIX = "account_quote_prefix";
+ private static final String PREFERENCE_REPLY_AFTER_QUOTE = "reply_after_quote";
private static final String PREFERENCE_SYNC_REMOTE_DELETIONS = "account_sync_remote_deletetions";
private static final String PREFERENCE_CRYPTO_APP = "crypto_app";
private static final String PREFERENCE_CRYPTO_AUTO_SIGNATURE = "crypto_auto_signature";
@@ -107,6 +108,7 @@ public class AccountSettings extends K9PreferenceActivity
private boolean mIncomingChanged = false;
private CheckBoxPreference mNotificationOpensUnread;
private EditTextPreference mAccountQuotePrefix;
+ private CheckBoxPreference mReplyAfterQuote;
private CheckBoxPreference mSyncRemoteDeletions;
private ListPreference mCryptoApp;
private CheckBoxPreference mCryptoAutoSignature;
@@ -173,6 +175,9 @@ public class AccountSettings extends K9PreferenceActivity
}
});
+ mReplyAfterQuote = (CheckBoxPreference) findPreference(PREFERENCE_REPLY_AFTER_QUOTE);
+ mReplyAfterQuote.setChecked(mAccount.isReplyAfterQuote());
+
mCheckFrequency = (ListPreference) findPreference(PREFERENCE_FREQUENCY);
mCheckFrequency.setValue(String.valueOf(mAccount.getAutomaticCheckIntervalMinutes()));
mCheckFrequency.setSummary(mCheckFrequency.getEntry());
@@ -621,6 +626,7 @@ public class AccountSettings extends K9PreferenceActivity
mAccount.setSyncRemoteDeletions(mSyncRemoteDeletions.isChecked());
mAccount.setSearchableFolders(Account.Searchable.valueOf(mSearchableFolders.getValue()));
mAccount.setQuotePrefix(mAccountQuotePrefix.getText());
+ mAccount.setReplyAfterQuote(mReplyAfterQuote.isChecked());
mAccount.setCryptoApp(mCryptoApp.getValue());
mAccount.setCryptoAutoSignature(mCryptoAutoSignature.isChecked());