diff --git a/modules/text.php b/modules/text.php
index 19f16dfe..de428d5d 100644
--- a/modules/text.php
+++ b/modules/text.php
@@ -41,7 +41,7 @@ function wpcf7_text_form_tag_handler( $tag ) {
 	$atts = array();
 
 	$atts['size'] = $tag->get_size_option( '40' );
-	$atts['maxlength'] = $tag->get_maxlength_option( '80' );
+	$atts['maxlength'] = $tag->get_maxlength_option( '400' );
 	$atts['minlength'] = $tag->get_minlength_option();
 
 	if ( $atts['maxlength'] and $atts['minlength']
@@ -156,7 +156,7 @@ function wpcf7_swv_add_text_rules( $schema, $contact_form ) {
 			);
 		}
 
-		if ( $maxlength = $tag->get_maxlength_option( '80' ) ) {
+		if ( $maxlength = $tag->get_maxlength_option( '400' ) ) {
 			$schema->add_rule(
 				wpcf7_swv_create_rule( 'maxlength', array(
 					'field' => $tag->name,
diff --git a/modules/textarea.php b/modules/textarea.php
index 1ee8c77a..f73e0a2f 100644
--- a/modules/textarea.php
+++ b/modules/textarea.php
@@ -30,7 +30,7 @@ function wpcf7_textarea_form_tag_handler( $tag ) {
 
 	$atts['cols'] = $tag->get_cols_option( '40' );
 	$atts['rows'] = $tag->get_rows_option( '10' );
-	$atts['maxlength'] = $tag->get_maxlength_option( '400' );
+	$atts['maxlength'] = $tag->get_maxlength_option( '2000' );
 	$atts['minlength'] = $tag->get_minlength_option();
 
 	if ( $atts['maxlength'] and $atts['minlength']
@@ -119,7 +119,7 @@ function wpcf7_swv_add_textarea_rules( $schema, $contact_form ) {
 			);
 		}
 
-		if ( $maxlength = $tag->get_maxlength_option( '400' ) ) {
+		if ( $maxlength = $tag->get_maxlength_option( '2000' ) ) {
 			$schema->add_rule(
 				wpcf7_swv_create_rule( 'maxlength', array(
 					'field' => $tag->name,